[weasel-commit] Source: dhcp=3.1.2_p1-4
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sun, 24 Jan 2010 07:58:08 -0500
================================
dhcp:source=3.1.2_p1-4 (previous: 3.1.2_p1-3)
cvc rdiff dhcp -1 /weasel.rpath.org@wgl:3-devel/3.1.2_p1-4
================================
3.1.2_p1-4 Filip Brcic (brcha@xxxxxxx) Sun Jan 24 07:57:55 2010
fixed recipe a bit
dhcp.recipe: changed
Index: dhcp.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- dhcp.recipe /weasel.rpath.org@wgl:3-devel/3.1.2_p1-3
+++ dhcp.recipe /weasel.rpath.org@wgl:3-devel/3.1.2_p1-4
@@ -1,23 +1,25 @@
#
# Copyright (c) 2004-2009 rPath, Inc.
-# 2009 Weasel GNU/Linux
+# 2009-2010 Weasel GNU/Linux
# This file is distributed under the terms of the MIT License.
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
-class Dhcp(CPackageRecipe):
+class Dhcp(AutoPackageRecipe):
name = 'dhcp'
version = '3.1.2_p1'
buildRequires = [ 'groff:runtime', ]
- def setup(r):
- r.Description(shortDesc='DHCP client, server and library',
- longDesc="""
- ISC Dynamic Host Configuration Protocol client, server and library""")
- r.PackageURL('http://www.isc.org/products/DHCP')
- r.Licenses('isc-dhcp')
+ shortDesc = 'DHCP client, server and library'
+ longDesc = """
+ISC Dynamic Host Configuration Protocol client, server and library
+"""
+ url = 'http://www.isc.org/products/DHCP'
+ licenses = [ 'isc-dhcp' ]
+ categories = [ 'Network/Misc' ]
+ def unpack(r):
v = r.version.replace('_alpha', 'a')
v = v.replace('_beta', 'b')
v = v.replace('_rc', 'rc')
@@ -100,25 +102,10 @@
r.macros.cflags = '-fPIC -Dlint -fno-strict-aliasing'
- if Arch.x86_64:
- # First build 32bit libs
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
+ def configure(r):
+ r.ManualConfigure('--copts "-DPARANOIA -DEARLY_CHROOT %(cflags)s"')
- r.Replace('LIBDIR = %(libdir)s', 'LIBDIR = %(prefix)s/lib',
- '../32bit/site.conf')
- r.ManualConfigure('--copts "-DPARANOIA -DEARLY_CHROOT %(cflags)s"',
- dir='../32bit', overrideMacros=macros32)
- r.Make(dir='../32bit', overrideMacros=macros32)
- r.MakeInstall(dir='../32bit', overrideMacros=macros32)
-
- r.ManualConfigure('--copts "-DPARANOIA -DEARLY_CHROOT %(cflags)s"')
- r.Make()
- r.MakeInstall()
-
+ def policy(r):
r.Run('mv client/dhclient.conf client/dhclient.conf.sample')
r.Install('client/dhclient.conf.sample', '%(sysconfdir)s/dhcp/',
component='dhclient:')
@@ -127,7 +114,10 @@
r.Install('server/dhcpd.conf.sample', '%(sysconfdir)s/dhcp/')
r.SetModes('%(essentialsbindir)s/dhclient-script', 0755)
- r.ExcludeDirectories(exceptions='%(localstatedir)s/(lib|run)/dhcp')
+ r.MakeDirs('%(localstatedir)s/lib/dhcp')
+ r.ExcludeDirectories(exceptions='%(localstatedir)s/lib/dhcp')
+ r.MakeDirs('%(localstatedir)s/run/dhcp')
+ r.ExcludeDirectories(exceptions='%(localstatedir)s/run/dhcp')
r.MakeDirs('%(localstatedir)s/lib/dhclient')
r.ExcludeDirectories(exceptions='%(localstatedir)s/lib/dhclient')
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: dhcp=3.1.2_p1-4 - rbuilder
