From 24c7369c90ea712c280181f4fdfe9d920ad54841 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Mar 22 2009 17:02:16 +0000
Subject: - update, with a fix for rebuild problems


---

diff --git a/.cvsignore b/.cvsignore
index 64e2de5..876b21f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcap-2.10.tar.bz2
+libcap-2.16.tar.gz
diff --git a/libcap-2.06-shared.patch b/libcap-2.06-shared.patch
deleted file mode 100644
index e5203ea..0000000
--- a/libcap-2.06-shared.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libcap-2.06/progs/Makefile.shared libcap-2.06/progs/Makefile
---- libcap-2.06/progs/Makefile.shared	2008-02-21 17:17:09.000000000 +0100
-+++ libcap-2.06/progs/Makefile	2008-02-21 17:17:28.000000000 +0100
-@@ -9,7 +9,8 @@ PROGS=getpcaps getcap setcap capsh
- all: $(PROGS)
- 
- $(PROGS): %: %.o
--	$(CC) --static $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
-+	#$(CC) --static $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
-+	$(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
- 
- %.o: %.c $(INCS)
- 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/libcap-2.16-headerfix.patch b/libcap-2.16-headerfix.patch
new file mode 100644
index 0000000..ae6eb28
--- /dev/null
+++ b/libcap-2.16-headerfix.patch
@@ -0,0 +1,12 @@
+diff -up libcap-2.16/libcap/include/sys/capability.h.incfix libcap-2.16/libcap/include/sys/capability.h
+--- libcap-2.16/libcap/include/sys/capability.h.incfix	2009-03-22 17:54:02.000000000 +0100
++++ libcap-2.16/libcap/include/sys/capability.h	2009-03-22 17:54:09.000000000 +0100
+@@ -19,7 +19,7 @@ extern "C" {
+  * information for the user library.
+  */
+ 
+-#include <sys/types.h>
++#include <linux/types.h>
+ #include <stdint.h>
+ 
+ /*
diff --git a/libcap.spec b/libcap.spec
index c916f94..7e4e2c9 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,9 +1,9 @@
 Name: libcap
-Version: 2.10
-Release: 3%{?dist}
+Version: 2.16
+Release: 2%{?dist}
 Summary: Library for getting and setting POSIX.1e capabilities
-Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.bz2
-Patch0: libcap-2.06-shared.patch
+Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz
+Patch0: libcap-2.16-headerfix.patch
 
 URL: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
 License: LGPLv2+
@@ -50,6 +50,9 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man{2,3,8}
 #mv -f doc/*.2 ${RPM_BUILD_ROOT}/%{_mandir}/man2/
 mv -f doc/*.3 ${RPM_BUILD_ROOT}/%{_mandir}/man3/
 
+# remove static lib
+rm -f ${RPM_BUILD_ROOT}/%{_lib}/libcap.a
+
 chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 
 %post -p /sbin/ldconfig
@@ -74,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Sun Mar 22 2009 Karsten Hopp <karsten@redhat.com> 2.16-1
+- update, with a fix for rebuild problems
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index e92aa36..3f78b32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a40050bb5e1c782ca97ccb5a54769d90  libcap-2.10.tar.bz2
+9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz