1 files changed, 16 insertions, 29 deletions
diff --git a/packaging/libcap.spec b/packaging/libcap.spec
index d2fd254..e0a20bf 100644
--- a/packaging/libcap.spec
+++ b/packaging/libcap.spec
@@ -1,15 +1,16 @@
 Name:           libcap
-Version:        2.24
-Release:        1
+Version:        2.69
+Release:        0
 License:        BSD-3-Clause or GPL-2.0
 Summary:        Library for Capabilities (linux-privs) Support
 Url:            https://sites.google.com/site/fullycapable/
 Group:          Base/Libraries
 Source:         %{name}-%{version}.tar.xz
-Source2:        baselibs.conf
-Source1001: 	libcap.manifest
-BuildRequires:  fdupes
+Source1001:     libcap.manifest
 BuildRequires:  libattr-devel
+BuildRequires:  perl
+BuildRequires:  grep
+Buildrequires:  sed
 %define debug_package_requires libcap2 = %{version}-%{release}
 
 %description
@@ -40,25 +41,18 @@ Summary:        Libcap utility programs
 Provides:       %{name}-progs
 
 %description tools
-This package contains utility programs handling capabilities via
-libcap.
+This package contains utility programs handling capabilities via libcap.
 
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %build
-lib=%{_lib} make %{?_smp_mflags} DEBUG="-g %{optflags}"
+lib=%{_libdir} bin=%{_bindir} sbin=%{_sbindir} make %{?_smp_mflags} all
 
 %install
-make install prefix=%{_prefix} DESTDIR=%{buildroot} LIBDIR=%{buildroot}/%{_lib} MANDIR=%{buildroot}%{_mandir} PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig RAISE_SETFCAP=no
-# remove unneeded files
-rm -f %{buildroot}/%{_lib}/*.*a
-# move *.so file to libdir and relink
-rm -f %{buildroot}/%{_lib}/*.so
-mkdir -p %{buildroot}%{_libdir}
-ln -s /%{_lib}/libcap.so.2 %{buildroot}%{_libdir}/libcap.so
-%fdupes -s %{buildroot}
+DESTDIR=${RPM_BUILD_ROOT} lib=%{_libdir} bin=%{_bindir} sbin=%{_sbindir} make install RAISE_SETFCAP=no
+rm -f %{buildroot}/%{_libdir}/*.*a
 
 %post -p /sbin/ldconfig
 
@@ -66,24 +60,17 @@ ln -s /%{_lib}/libcap.so.2 %{buildroot}%{_libdir}/libcap.so
 
 %files
 %manifest %{name}.manifest
-%defattr(-,root,root)
 %license License
-%attr(755,root,root) /%{_lib}/libcap.so.*
+%{_libdir}/lib*.so.*
 
 %files tools
 %manifest %{name}.manifest
-%defattr(-,root,root)
 %license License
-%{_mandir}/man1/*
-%{_mandir}/man8/*
-%{_prefix}/sbin/*
+%{_sbindir}/*
 
 %files devel
 %manifest %{name}.manifest
-%defattr(-,root,root)
-%{_includedir}/sys/capability.h
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*
-
-%changelog
+%{_includedir}/sys/*.h
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/lib*.pc
+%exclude %{_mandir}