From 8ac4daddd3cd5ffce46870929c89e5058a585c35 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Wed, 18 Nov 2020 13:56:59 -0500
Subject: [PATCH] New upstream bugfix release

---
 .gitignore     |  1 +
 libcap-ng.spec | 32 +++++++++++++++-----------------
 sources        |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c3ff0b..3551f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ libcap-ng-0.6.4.tar.gz
 /libcap-ng-0.7.10.tar.gz
 /libcap-ng-0.7.11.tar.gz
 /libcap-ng-0.8.tar.gz
+/libcap-ng-0.8.1.tar.gz
diff --git a/libcap-ng.spec b/libcap-ng.spec
index bb06c6f..6db9298 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -1,6 +1,6 @@
 Summary: An alternate posix capabilities library
 Name: libcap-ng
-Version: 0.8
+Version: 0.8.1
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://people.redhat.com/sgrubb/libcap-ng
@@ -47,27 +47,19 @@ lets you set the file system based capabilities.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib} --with-python=no --with-python3
+%configure --libdir=%{_libdir} --with-python=no --with-python3
 make CFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
 make DESTDIR="${RPM_BUILD_ROOT}" INSTALL='install -p' install
 
-# Move the symlink
-rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.so
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{name}.so.*.*.*)
-LIBNAME=$(basename $VLIBNAME)
-ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so
-
-# Move the pkgconfig file
-mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
-
 # Remove a couple things so they don't get picked up
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{python3_version}/site-packages/_capng.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{python3_version}/site-packages/_capng.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcap-ng.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libcap-ng.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdrop_ambient.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdrop_ambient.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_capng.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_capng.la
 
 %check
 make check
@@ -77,12 +69,15 @@ make check
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING.LIB
-/%{_lib}/libcap-ng.so.*
+/%{_libdir}/libcap-ng.so.*
+/%{_libdir}/libdrop_ambient.so.*
+%attr(0644,root,root) %{_mandir}/man7/*
 
 %files devel
 %attr(0644,root,root) %{_mandir}/man3/*
 %attr(0644,root,root) %{_includedir}/cap-ng.h
 %{_libdir}/libcap-ng.so
+%{_libdir}/libdrop_ambient.so
 %attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4
 %{_libdir}/pkgconfig/libcap-ng.pc
 
@@ -97,6 +92,9 @@ make check
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 18 2020 Steve Grubb <sgrubb@redhat.com> 0.8.1-1
+- New upstream bugfix release
+
 * Tue Sep 08 2020 Steve Grubb <sgrubb@redhat.com> 0.8-1
 - New upstream feature release
 
diff --git a/sources b/sources
index 3d65851..709cad1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libcap-ng-0.8.tar.gz) = d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2
+SHA512 (libcap-ng-0.8.1.tar.gz) = cd28ceb43e2cf5d3a0140fddbd2ea13dfda8eeea8a6de1817f3cc3b38df874ab8653917dbd405ad7aaaa71bcb9ec246d995079aa3cb0af1cffbdb37dfdd99232