From caefeee4f377f57d8a570aa3d07128112966999b Mon Sep 17 00:00:00 2001 From: jvdias Date: Mon, 8 May 2006 14:49:47 +0000 Subject: [PATCH] Upgrade to upstream version 3.0.4; Add new dhclient options: -H -F -T ; fix build on ia64 now that cf/linux.h defines PTRSIZE_64BIT --- dhcp.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dhcp.spec b/dhcp.spec index 13316df..8543fa5 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -12,6 +12,7 @@ Source1: dhcpd.conf.sample Source2: dhcpd.init Source3: dhcrelay.init Source4: dhcpd.conf +Source5: findptrsize.c Patch: dhcp-3.0-alignment.patch Patch100: dhcp-3.0-jbuild.patch Patch102: dhcp-3.0.1rc13-dhcpctlman.patch @@ -221,12 +222,9 @@ cat <>includes/site.h EOF %build -cat <findptrsize.c -#include -int main(void) { printf("%%d\n", sizeof(void *)); return 0; } -EOF +cp -fp %SOURCE5 . RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror -Wno-unused" -%{__cc} -o findptrsize findptrsize.c +%{__cc} -I. -o findptrsize findptrsize.c [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT" %ifarch s390 s390x RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"