diff --git a/libcap-u64-typedef-fix.diff b/libcap-u64-typedef-fix.diff new file mode 100644 index 0000000..521ab6e --- /dev/null +++ b/libcap-u64-typedef-fix.diff @@ -0,0 +1,19 @@ +--- + libcap/include/sys/capability.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/libcap/include/sys/capability.h ++++ b/libcap/include/sys/capability.h +@@ -31,8 +31,11 @@ + #define __LINUX_COMPILER_H + #define __user + +-typedef unsigned int __u32; ++#include ++typedef uint32_t __u32; + typedef __u32 __le32; ++typedef uint64_t __u64; ++typedef __u32 __le64; + + #include + diff --git a/libcap.changes b/libcap.changes index 6f0f573..14d57da 100644 --- a/libcap.changes +++ b/libcap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 16:39:43 CET 2009 - tiwai@suse.de + +- fix build error on i386 due to missing __u64 definition in + sys/capability.h + ------------------------------------------------------------------- Wed Jan 7 16:52:19 CET 2009 - tiwai@suse.de diff --git a/libcap.spec b/libcap.spec index 3c59230..d9bd61b 100644 --- a/libcap.spec +++ b/libcap.spec @@ -26,8 +26,9 @@ Group: System/Libraries AutoReqProv: on Summary: Library for Capabilities (linux-privs) Support Version: 2.16 -Release: 1 +Release: 2 Source: ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2 +Patch: libcap-u64-typedef-fix.diff #URL: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libcap2 = %{version}-%{release} @@ -88,6 +89,7 @@ libcap. %prep %setup -q +%patch -p1 %build # lib=%{_lib} make %{?jobs:-j %jobs} COPTFLAG="$RPM_OPT_FLAGS" @@ -124,6 +126,9 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 tiwai@suse.de +- fix build error on i386 due to missing __u64 definition in + sys/capability.h * Wed Jan 07 2009 tiwai@suse.de - updated to libcap-2.15: * Makefile fixes