rpms/libnl/devel libnl-1.0-pre5-__u64_x86_64.patch, NONE, 1.1 libnl.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22299

Modified Files:
	libnl.spec 
Added Files:
	libnl-1.0-pre5-__u64_x86_64.patch 
Log Message:
Allow build to succeed with new gcc / glibc-kernheaders

libnl-1.0-pre5-__u64_x86_64.patch:
 netlink-local.h |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE libnl-1.0-pre5-__u64_x86_64.patch ---
--- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64	2005-11-02 12:29:06.000000000 -0500
+++ libnl-1.0-pre5/include/netlink-local.h	2006-05-26 20:09:28.000000000 -0400
@@ -30,11 +30,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-typedef uint8_t		__u8;
-typedef uint16_t	__u16;
-typedef uint32_t	__u32;
-typedef int32_t		__s32;
-typedef uint64_t	__u64;
+#include <asm/types.h>
 
 /* local header copies */
 #include <linux/if.h>


Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libnl.spec	26 May 2006 22:34:56 -0000	1.12
+++ libnl.spec	27 May 2006 00:11:06 -0000	1.13
@@ -14,6 +14,7 @@
 Patch1: libnl-64bit.patch
 Patch2: libnl-1.0-install-no-root.patch
 Patch3: libnl-1.0-pre5-static.patch
+Patch4: libnl-1.0-pre5-__u64_x86_64.patch
 
 %description
 This package contains a convenience library to simplify
@@ -34,6 +35,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -67,6 +69,8 @@
 
 %changelog
 * Fri May 26 2006 Jason Vas Dias <jvdias at redhat.com> 1.0-0.9.pre5
+- Allow build to succeed with new gcc / glibc-kernheaders
+  (compile failed on __u64 redefinition on x86_64).
 - Add a static %{_libdir}/libnl.a library to libnl-devel for
   programs that might need to do a static link to libnl.
   Added after consultation with Christopher Aillon.