From 4cd05791008d37797febec9663d8ef710267883c Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Wed, 27 Jul 2011 15:10:13 +0200
Subject: [PATCH] update to 2.22 (#689752)

---
 .gitignore                  |  1 +
 libcap-2.16-headerfix.patch | 13 -------------
 libcap.spec                 | 16 +++++++++-------
 sources                     |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 libcap-2.16-headerfix.patch

diff --git a/.gitignore b/.gitignore
index a0531c4..0479603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libcap-2.17.tar.gz
+/libcap-2.22.tar.bz2
diff --git a/libcap-2.16-headerfix.patch b/libcap-2.16-headerfix.patch
deleted file mode 100644
index d7a1d0b..0000000
--- a/libcap-2.16-headerfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libcap-2.16/libcap/include/sys/capability.h.hfix libcap-2.16/libcap/include/sys/capability.h
---- libcap-2.16/libcap/include/sys/capability.h.hfix	2009-06-15 14:46:51.000000000 +0200
-+++ libcap-2.16/libcap/include/sys/capability.h	2009-06-15 14:47:00.000000000 +0200
-@@ -30,6 +30,9 @@ extern "C" {
- #define _LINUX_FS_H
- #define __LINUX_COMPILER_H
- #define __user
-+#define _ASM_X86_SIGCONTEXT_H
-+#define _ASM_POWERPC_SIGCONTEXT_H
-+#define _SPARC_SIGCONTEXT_H
- 
- typedef unsigned int __u32;
- typedef __u32 __le32;
diff --git a/libcap.spec b/libcap.spec
index 668ff7a..f246ca0 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,9 +1,8 @@
 Name: libcap
-Version: 2.17
-Release: 2%{?dist}
+Version: 2.22
+Release: 1%{?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.gz
-Patch0: libcap-2.16-headerfix.patch
+Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.bz2
 
 URL: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
 License: LGPLv2+
@@ -31,7 +30,6 @@ libcap.
 
 %prep
 %setup -q
-#patch0 -p1
 
 %build
 # libcap can not be build with _smp_mflags:
@@ -40,7 +38,8 @@ make PREFIX=%{_prefix} LIBDIR=%{_lib} SBINDIR=%{_sbindir} \
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT} \
+make install RAISE_SETFCAP=no \
+             DESTDIR=${RPM_BUILD_ROOT} \
              LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
              SBINDIR=${RPM_BUILD_ROOT}/%{_sbindir} \
              INCDIR=${RPM_BUILD_ROOT}/%{_includedir} \
@@ -62,6 +61,7 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 %defattr(-,root,root,-)
 /%{_lib}/*.so.*
 %{_sbindir}/*
+%{_mandir}/man1/*
 %{_mandir}/man8/*
 /%{_lib}/security/pam_cap.so
 %doc doc/capability.notes License
@@ -70,13 +70,15 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 %defattr(-,root,root,-)
 %{_includedir}/*
 /%{_lib}/*.so
-#{_mandir}/man2/*
 %{_mandir}/man3/*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Jul 27 2011 Karsten Hopp <karsten@redhat.com> 2.22-1
+- update to 2.22 (#689752)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a82aac1..5bd38b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz
+ce64058bdb3f086ddbfca8ce6c919845  libcap-2.22.tar.bz2