[weasel-commit] Source: cpanpackage=0-16.1.12
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Mon, 28 Jun 2010 18:35:51 -0400
================================
cpanpackage:source=0-16.1.12 (previous: 0-16.1.11)
cvc rdiff cpanpackage -1
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/0-16.1.12
================================
0-16.1.12 Filip Brcic (brcha@xxxxxxxxxxxx) Mon Jun 28 18:35:43 2010
fixed the recipe a bit
cpanpackage.recipe: changed
Index: cpanpackage.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- cpanpackage.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/0-16.1.11
+++ cpanpackage.recipe
/conary.rpath.com@rpl:devel//2-devel//weasel.rpath.org@wgl:3-devel/0-16.1.12
@@ -5,6 +5,7 @@
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
+loadInstalled('perl')
class CPANPackageRecipe(CPackageRecipe):
buildRequires = [ 'perl:runtime', 'perl:lib', 'perl:devellib',
'glibc:runtime' ]
@@ -19,7 +20,7 @@
abstractBaseClass = True
- pversion = '' # set this only if actually specific to some perl version
+ pversion = None # set this only if actually specific to some perl version
upstreamname = None
maindirname = None
installtarget = 'install'
@@ -31,12 +32,7 @@
patches = None
- def __init__(r, *args, **kw):
- PackageRecipe.__init__(r, *args, **kw)
-
- if r.__class__.__name__ == 'CPANPackageRecipe':
- return
-
+ def setup(r):
# name - "perl-"
if r.name.startswith('perl-'):
r.pname = r.name[5:]
@@ -75,9 +71,19 @@
r.macros.serverdir = r.serverdir
r.macros.serverdirold = r.serverdirold
+ if r.pversion == None:
+ r.pversion = Perl.version
r.macros.pversion = r.pversion
- r.macros.perldir = '%(libdir)s/perl5/vendor_perl/%(pversion)s'
+ r.macros.perl_package = 'perl' + r.pversion.split('.')[0]
+ r.macros.perldir =
'%(libdir)s/%(perl_package)s/vendor_perl/%(pversion)s'
+ # Now go for the build
+ r.disableParallelMake()
+ r.unpack()
+ r.build()
+ r.install()
+ r.installDocs()
+ r.post()
def unpack(r):
r.addArchive([
@@ -114,12 +120,3 @@
pass
- def setup(r):
- if r.__class__.__name__ == 'CPANPackageRecipe':
- return
- r.disableParallelMake()
- r.unpack()
- r.build()
- r.install()
- r.installDocs()
- r.post()
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: cpanpackage=0-16.1.12 - rbuilder
