diff --git a/.gitignore b/.gitignore index 5fdb45f..887d514 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libcap-2.17.tar.gz /libcap-2.22.tar.bz2 /libcap-2.24.tar.gz +/libcap-2.25.tar.gz diff --git a/libcap-2.24-buildflags.patch b/libcap-2.25-buildflags.patch similarity index 69% rename from libcap-2.24-buildflags.patch rename to libcap-2.25-buildflags.patch index 588eff8..48745fd 100644 --- a/libcap-2.24-buildflags.patch +++ b/libcap-2.25-buildflags.patch @@ -1,6 +1,6 @@ -diff -up libcap-2.24/Make.Rules.rh libcap-2.24/Make.Rules ---- libcap-2.24/Make.Rules.rh 2014-04-16 11:01:44.027253230 +0200 -+++ libcap-2.24/Make.Rules 2014-04-16 11:02:40.340233607 +0200 +diff -up libcap-2.25/Make.Rules.rh libcap-2.25/Make.Rules +--- libcap-2.25/Make.Rules.rh 2016-04-11 18:52:01.418065682 +0200 ++++ libcap-2.25/Make.Rules 2016-04-11 18:52:10.790113866 +0200 @@ -49,7 +49,8 @@ KERNEL_HEADERS := $(topdir)/libcap/inclu IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include @@ -17,6 +17,6 @@ diff -up libcap-2.24/Make.Rules.rh libcap-2.24/Make.Rules LD=$(CC) -Wl,-x -shared -LDFLAGS := #-g +LDFLAGS := $(RPM_LD_FLAGS) #-g + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) SYSTEM_HEADERS = /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h diff --git a/libcap.spec b/libcap.spec index 4e9f076..bf13ab4 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,12 +1,12 @@ Name: libcap -Version: 2.24 -Release: 9%{?dist} +Version: 2.25 +Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities #Source: http://mirror.linux.org.au/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.bz2 Source: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz # http://manned.org/getpcaps/299a4949/src: Source1: getpcaps.8 -Patch0: %{name}-2.24-buildflags.patch +Patch0: %{name}-2.25-buildflags.patch URL: https://sites.google.com/site/fullycapable/ License: GPLv2 @@ -43,11 +43,9 @@ 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/ + LIBDIR=%{_libdir} \ + SBINDIR=%{_sbindir} + mkdir -p %{buildroot}/%{_mandir}/man{2,3,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ cp -f %{SOURCE1} %{buildroot}/%{_mandir}/man8/ @@ -82,6 +80,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* rm -rf %{buildroot} %changelog +* Mon Apr 11 2016 Karsten Hopp - 2.25-1 +- libcap-2.25 + * Thu Feb 04 2016 Fedora Release Engineering - 2.24-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 63ec7c8..7d03ceb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffb154f29b1d28466c6fe6add8286a2d libcap-2.24.tar.gz +4b18f7166a121138cca0cdd8ab64df4c libcap-2.25.tar.gz