From 5a20fd5cee372a00269e87df5d8ce93b97864b0eaae70dcc97f017935bdc32fa Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 2 Dec 2010 14:57:01 +0000
Subject: [PATCH] Accepting request 54338 from
 home:msmeissn:branches:Base:System

ok

OBS-URL: https://build.opensuse.org/request/show/54338
OBS-URL: https://build.opensuse.org/package/show/Base:System/libcap?expand=0&rev=12
---
 libcap-2.16.tar.bz2         |  3 ---
 libcap-2.19.tar.bz2         |  3 +++
 libcap-u64-typedef-fix.diff | 28 ----------------------------
 libcap.changes              | 12 ++++++++++++
 libcap.spec                 |  5 ++---
 5 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 libcap-2.16.tar.bz2
 create mode 100644 libcap-2.19.tar.bz2
 delete mode 100644 libcap-u64-typedef-fix.diff

diff --git a/libcap-2.16.tar.bz2 b/libcap-2.16.tar.bz2
deleted file mode 100644
index 501731a..0000000
--- a/libcap-2.16.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f
-size 48451
diff --git a/libcap-2.19.tar.bz2 b/libcap-2.19.tar.bz2
new file mode 100644
index 0000000..d8acfae
--- /dev/null
+++ b/libcap-2.19.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce
+size 53099
diff --git a/libcap-u64-typedef-fix.diff b/libcap-u64-typedef-fix.diff
deleted file mode 100644
index c894afb..0000000
--- a/libcap-u64-typedef-fix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- libcap/include/sys/capability.h |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/libcap/include/sys/capability.h
-+++ b/libcap/include/sys/capability.h
-@@ -26,13 +26,19 @@
-  * 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
- #define __LINUX_COMPILER_H
- #define __user
- 
--typedef unsigned int __u32;
-+/* HACK to fix build of libcap itself */
-+#ifndef _LINUX_TYPES_H
-+#define _LINUX_TYPES_H
-+#include <stdint.h>
-+typedef uint32_t __u32;
- typedef __u32 __le32;
-+typedef uint64_t __u64;
-+typedef __u64 __le64;
-+#endif /* HACK */
- 
- #include <linux/capability.h>
- 
diff --git a/libcap.changes b/libcap.changes
index 2b1e10a..5611b02 100644
--- a/libcap.changes
+++ b/libcap.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Dec  2 15:44:59 CET 2010 - meissner@suse.de
+
+- updated to libcap-2.19
+  * more stuff in capsh.c
+  * sys/capability.h header clean up and fixes.
+
+-------------------------------------------------------------------
+Thu Dec  2 15:32:34 CET 2010 - meissner@suse.de
+
+- fixed build on ppc64 (needs to get linux/types.h included first).
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
 
diff --git a/libcap.spec b/libcap.spec
index 56e7899..7334e61 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -23,11 +23,10 @@ License:        BSD3c
 Group:          System/Libraries
 AutoReqProv:    on
 Summary:        Library for Capabilities (linux-privs) Support
-Version:        2.16
+Version:        2.19
 Release:        6
 Source:         ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch:          libcap-u64-typedef-fix.diff
 #URL:		http://www.kernel.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libattr-devel
@@ -92,7 +91,6 @@ libcap.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 # lib=%{_lib} make %{?_smp_mflags} COPTFLAG="$RPM_OPT_FLAGS"
@@ -120,6 +118,7 @@ ln -s /%{_lib}/libcap.so.2 $RPM_BUILD_ROOT%{_libdir}/libcap.so
 
 %files progs
 %defattr(-,root,root)
+%{_mandir}/man1/*
 %{_mandir}/man8/*
 /sbin/*