From 2544c6565ace81876e5e2b3bd9162ebd7b75ba50 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:21:31 +0000
Subject: [PATCH] auto-import changelog data from libcap-1.10-6.src.rpm Fri Nov
 09 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.10-6 - Fix
 sys/capabilities.h header (#55727) - Move to /lib, some applications seem to
 be using this rather early     (#55733)

---
 libcap-1.10-userland.patch | 19 ++++++++++++++++++
 libcap.spec                | 40 ++++++++++++++++++++++++++------------
 2 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 libcap-1.10-userland.patch

diff --git a/libcap-1.10-userland.patch b/libcap-1.10-userland.patch
new file mode 100644
index 0000000..7cc205b
--- /dev/null
+++ b/libcap-1.10-userland.patch
@@ -0,0 +1,19 @@
+--- libcap-1.10/libcap/include/sys/capability.h.foo	Fri Nov  9 16:26:25 2001
++++ libcap-1.10/libcap/include/sys/capability.h	Fri Nov  9 16:28:47 2001
+@@ -21,6 +21,16 @@
+  */
+ 
+ #include <sys/types.h>
++#include <stdint.h>
++
++/*
++ * Make sure we can be included from userland by preventing
++ * capability.h from including other kernel headers
++ */
++#define _LINUX_TYPES_H
++#define _LINUX_FS_H
++typedef uint32_t __u32;
++
+ #include <linux/capability.h>
+ 
+ /*
diff --git a/libcap.spec b/libcap.spec
index 0e25562..163e78d 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,38 +1,46 @@
 Name: libcap
 Version: 1.10
-Release: 5
-Summary: Library for getting and setting POSIX.1e capabilities
-Source: ftp://ftp.kernel.org/pub/linux/libraries/security/libcap/kernel-2.4/%{name}-%{version}.tar.bz2
+Release: 6
+Summary: Library for getting and setting POSIX.1e capabilities.
+Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2
 License: BSD-like and LGPL
 Patch: libcap-1.10-ia64.patch
+Patch1: libcap-1.10-userland.patch
 Patch2: libcap-1.10-shared.patch
+Patch3: libcap-1.10-alpha.patch
 Group: System Environment/Libraries
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-%{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
+libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
 draft 15 capabilities.
 
 %package devel
-Summary: Development files for %{name}
+Summary: Development files for libcap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-Development files (Headers, libraries for static linking, etc) for %{name}.
+Development files (Headers, libraries for static linking, etc) for libcap.
 
-%{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
+libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
 draft 15 capabilities.
 
-Install %{name}-devel if you want to develop or compile applications using
-%{name}.
+Install libcap-devel if you want to develop or compile applications using
+libcap.
 
+%{name} is a library for getting and setting POSIX.1e (formerly POSIX 6)
+%{name}.
 %prep
 %setup
 %ifarch ia64 s390 s390x
 %patch -p1 -b .ia64
 %endif
+%ifarch alpha
+%patch3 -p1 -b .alpha
+%endif
+%patch1 -p1 -b .userland
 %patch2 -p1 -b .shared
 perl -pi -e "s,^COPTFLAGS=.*,COPTFLAGS=$RPM_OPT_FLAGS,g" Make.Rules
 perl -pi -e 's,^man_prefix=.*,man_prefix=\$\(prefix)/share,g' Make.Rules
@@ -42,20 +50,23 @@ make prefix=/usr
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install prefix=/usr FAKEROOT=$RPM_BUILD_ROOT
+make install prefix=%{_prefix} FAKEROOT=$RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT/lib
+mv $RPM_BUILD_ROOT%{_libdir}/* $RPM_BUILD_ROOT/lib
+rm -rf $RPM_BUILD_ROOT%{_libdir}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%{_libdir}/*.so.*
+/lib/*.so.*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/*
-%{_libdir}/*.so
+/lib/*.so
 %{_mandir}/man2/*
 %{_mandir}/man3/*
 
@@ -63,6 +74,11 @@ make install prefix=/usr FAKEROOT=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
+* Fri Nov  9 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.10-6
+- Fix sys/capabilities.h header (#55727)
+- Move to /lib, some applications seem to be using this rather early
+  (#55733)
+
 * Mon Jul 16 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Add post,postun scripts