[weasel-commit] Source: conary=2.1.19.1-0.0.1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Fri, 11 Jun 2010 16:11:27 -0400
================================
conary:source=2.1.19.1-0.0.1 (previous: 2.1.1.1+tip-0.0.17)
cvc rdiff conary -1
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.1.19.1-0.0.1
================================
2.1.19.1-0.0.1 Filip Brcic (brcha@xxxxxxxxxxxx) Fri Jun 11 16:09:31 2010
conary 2.1.19.1
--conary-2.1.19.1.tar.bz2: new
conary.recipe: changed
Index: conary.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- conary.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.1.1.1+tip-0.0.17
+++ conary.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/2.1.19.1-0.0.1
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004-2009 rPath, Inc.
+# Copyright (c) 2004-2010 rPath, Inc.
# This file is distributed under the terms of the MIT License.
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
@@ -7,14 +7,14 @@
loadInstalled('python')
class Conary(CPackageRecipe, Python.VersionMixIn):
name = 'conary'
- version = '2.1.1.1+tip'
+ version = '2.1.19.1'
buildRequires = [
- 'python:devel', 'python:lib', 'libelf:devel',
+ 'python:devel', 'python:lib', 'libelf-lgpl:devel',
'pycrypto:python', 'openssl:devel', 'zlib:devel',
'python:runtime', 'elementtree:python', 'kid:python',
'perl:runtime', 'm2crypto:python', 'ncurses:devel',
- 'readline:devel',
+ 'readline:devel', 'sqlite:devel',
]
shortDesc = 'Conary package manager'
@@ -26,19 +26,14 @@
def setup(r):
r.setDefaultPython()
r.macros.sitepkgs = '%s/%%(name)s' % Python.sitepkgs
- r.macros.sqlitever = '3.6.18'
- r.macros.sqlite = 'sqlite-%(sqlitever)s'
# r.addArchive('ftp://download.rpath.com/conary/')
if r.version.endswith('+tip'):
r.addMercurialSnapshot('http://bitbucket.org/brcha/conary/')
else:
r.addMercurialSnapshot('http://bitbucket.org/brcha/conary/',
+ # r.addMercurialSnapshot('http://hg.rpath.com/conary-2.1/', tag=r.tag)
tag='%(name)s-%(version)s')
r.addPatch('rpl2-build-flags.patch')
-
- # Use embedded sqlite
-
r.addArchive('http://sqlite.org/sqlite-amalgamation-%(sqlitever)s.tar.gz',
- dir='%(maindir)s/conary/pysqlite3/')
# temporary hack until RPL-1510 is properly resolved
r.Replace(re.escape('--hash-style=gnu'), '', 'config/macros')
@@ -78,11 +73,6 @@
# preMake='NO_KID=1'
# else:
# preMake = ''
-
- # Build internal sqlite library for Conary to use
- r.Configure('--disable-shared --enable-threadsafe',
- dir='conary/pysqlite3/%(sqlite)s')
- r.Make('CFLAGS="%(cflags)s -fPIC"', dir='conary/pysqlite3/%(sqlite)s')
r.Make('libdir=%(libdir)s' + conf, preMake=preMake)
r.MakeInstall('libdir=%(libdir)s', preMake=preMake)
@@ -133,6 +123,8 @@
# only
r.InitialContents('%(sysconfdir)s/conary/.*gpg')
+ r.Requires('sqlite:lib(addcolumn threadsafe)', '%(bindir)s/.*')
+
# Ensure that we get the right version of python when migrating
# from rPL1-based to rPL2-based systems; this is critical when
# any part of the update uses SSL. (RPL-3043)
@@ -157,6 +149,9 @@
# it moves to cvc we can remove this whiteout
r.Requires(exceptDeps=('%(bindir)s/conary',
'python: conary.build.cook'))
+ # CNY-3314 -- conary.commit should not depend on conary.cvc
+ r.Requires(exceptDeps=('.*/conary/commit\.py.*$',
+ 'python: conary.cvc'))
# conary commit requires cvc, but normal user will commit nothing
# so it will harm noone if that dep is removed
@@ -195,9 +190,3 @@
r.Requires('python:lib', '%(sitepkgs)s/.*')
r.Requires('pycrypto:python', '%(sitepkgs)s/lib/sha1helper.py')
r.Requires('elementtree:python',
'%(sitepkgs)s/build/packagepolicy.py')
-
- # Remove the compiled python dep finder so that other versions of
python
- # can be used to find deps.
- r.Remove('%(sitepkgs)s/lib/pydeps.py{c,o}')
- r.Requires(exceptDeps='python: stat(2.4 lib64)')
- r.Requires(exceptions='%(sysconfdir)s/conary/.*')
--tip.tar.bz2: removed
sqlite-amalgamation-3.6.18.tar.gz: removed
Committed by: brcha
Other related posts:
