rpms/dhcp/devel findptrsize.c,NONE,1.1 dhcp.spec,1.89,1.90

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28322

Modified Files:
	dhcp.spec 
Added Files:
	findptrsize.c 
Log Message:
Upgrade to upstream version 3.0.4; Add new dhclient options: -H <host-name> -F <fqdn> -T <timeout>; fix build on ia64 now that cf/linux.h defines PTRSIZE_64BIT


--- NEW FILE findptrsize.c ---
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
#include "includes/cf/linux.h"
int main(void) 
{  
  if ( sizeof(void*) > 4 )
  {
#ifndef PTRSIZE_64BIT
    printf("%d\n", sizeof(void *));
    return 0; 
#endif
  }
  printf("4\n");
  return 0; 
}


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- dhcp.spec	8 May 2006 13:58:22 -0000	1.89
+++ dhcp.spec	8 May 2006 14:49:47 -0000	1.90
@@ -12,6 +12,7 @@
 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 @@
 EOF
 
 %build
-cat <<EOF >findptrsize.c
-#include <stdio.h>
-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"