From b686ff0d84b37faf63f3cb6310ebefade18abd1759e76cf316deac2597ad4550 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Tue, 30 Aug 2016 13:33:41 +0000
Subject: [PATCH] Accepting request 423725 from home:dimstar:Factory

Update to version 2.25 - NOTE: GNOME 3.22 requires at least version 2.23, TW currenly has 2.22; as we need to care for an update anyway, we bumped to 2.25 (current latest)

OBS-URL: https://build.opensuse.org/request/show/423725
OBS-URL: https://build.opensuse.org/package/show/Base:System/libcap?expand=0&rev=21
---
 libcap-2.24.tar.xz     |  3 ---
 libcap-2.25.tar.xz     |  3 +++
 libcap-nolibattr.patch | 11 -----------
 libcap.changes         | 15 +++++++++++++++
 libcap.spec            | 26 ++++++++++++--------------
 5 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 libcap-2.24.tar.xz
 create mode 100644 libcap-2.25.tar.xz
 delete mode 100644 libcap-nolibattr.patch

diff --git a/libcap-2.24.tar.xz b/libcap-2.24.tar.xz
deleted file mode 100644
index e32607c..0000000
--- a/libcap-2.24.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65
-size 63412
diff --git a/libcap-2.25.tar.xz b/libcap-2.25.tar.xz
new file mode 100644
index 0000000..48b06f2
--- /dev/null
+++ b/libcap-2.25.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162
+size 63672
diff --git a/libcap-nolibattr.patch b/libcap-nolibattr.patch
deleted file mode 100644
index a40e930..0000000
--- a/libcap-nolibattr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcap-2.22.orig/libcap/Makefile
-+++ libcap-2.22/libcap/Makefile
-@@ -16,7 +16,7 @@
- # no support).
- ifeq ($(LIBATTR),yes)
- FILES += cap_file
--LDFLAGS += -lattr
-+LDFLAGS +=
- DEPS = -lattr
- endif
- 
\ No newline at end of file
diff --git a/libcap.changes b/libcap.changes
index 8760d5a..50145a0 100644
--- a/libcap.changes
+++ b/libcap.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug 29 21:10:05 UTC 2016 - dimstar@opensuse.org
+
+- Update to versison 2.25:
+  + Recover gperf detection in make rules.
+  + Man page typo fix.
+  + Tweak make rules to make packaging more straightforward.
+  + Fix error explanation in setcap.
+  + Drop need to link with libattr. It turns out libcap wasn't
+    actually using any code from that library, so linking to it was
+    superfluous.
+- Drop libcap-nolibattr.patch: fixed upstream.
+- No longer add %{buildroot} to all variables for make install the
+  Makefile learned about the meaning of DESTDIR.
+
 -------------------------------------------------------------------
 Sat Jan 31 11:22:58 UTC 2015 - p.drouand@gmail.com
 
diff --git a/libcap.spec b/libcap.spec
index 5e67df8..7e3452c 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libcap
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,11 @@ Name:           libcap
 Summary:        Library for Capabilities (linux-privs) Support
 License:        BSD-3-Clause and GPL-2.0
 Group:          System/Libraries
-Version:        2.24
+Version:        2.25
 Release:        0
 Source:         https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-%{version}.tar.xz
 Source2:        baselibs.conf
 Url:            https://sites.google.com/site/fullycapable/
-Patch0:         libcap-nolibattr.patch
 BuildRequires:  fdupes
 BuildRequires:  pkg-config
 
@@ -77,7 +76,6 @@ libcap.
 
 %prep
 %setup -q
-%patch0 -p1
 %build
 make prefix=%{_prefix} lib=%{_lib} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} \
      INCDIR=%{_includedir} MANDIR=%{_mandir} DEBUG="-g %{optflags}"
@@ -85,15 +83,14 @@ make prefix=%{_prefix} lib=%{_lib} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} \
 %install
 make install RAISE_SETFCAP=no \
              DESTDIR=%{buildroot} \
-             LIBDIR=%{buildroot}/%{_libdir} \
-             SBINDIR=%{buildroot}/%{_sbindir} \
-             INCDIR=%{buildroot}/%{_includedir} \
-             MANDIR=%{buildroot}/%{_mandir}/ \
-             PKGCONFIGDIR=%{buildroot}/%{_libdir}/pkgconfig/
-mkdir -p %{buildroot}/%{_mandir}/man{2,3,8}
-mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/
-# remove unneeded files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.*a
+             LIBDIR=/%{_libdir} \
+             SBINDIR=/%{_sbindir} \
+             INCDIR=/%{_includedir} \
+             MANDIR=/%{_mandir}/ \
+             PKGCONFIGDIR=%{_libdir}/pkgconfig/
+find %{buildroot} -type f -name '*.la' -print -delete
+# do not provide static libs
+rm %{buildroot}%{_libdir}/libcap.a
 %fdupes -s $RPM_BUILD_ROOT
 
 %post -n libcap2 -p /sbin/ldconfig
@@ -102,7 +99,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.*a
 
 %files -n libcap2
 %defattr(-,root,root)
-%attr(755,root,root)%{_libdir}/libcap.so.*
+%doc License
+%{_libdir}/libcap.so.*
 
 %files progs
 %defattr(-,root,root)