- updated to 2.21

[packages/libcap.git] / libcap.spec

diff --git a/libcap.spec b/libcap.spec
index 31c91368cca3a9927e41b3879e077209fa1d36f7..d977e749c67298c87e6a31ea6b72803f1d8b65a0 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -2,17 +2,19 @@ Summary:      POSIX.1e capability suite
 Summary(pl.UTF-8):     Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):  Biblioteca para leitura e configuração de capabilities.
 Name:          libcap
-Version:       2.16
-Release:       2
+Version:       2.21
+Release:       1
 Epoch:         1
 License:       GPL or BSD
 Group:         Applications/System
 Source0:       ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz
-# Source0-md5: 9e075fda242c4070ba76407064c13302
+# Source0-md5: 61966ef40f2dee8731b69db895e4548d
 Patch0:                %{name}-make.patch
+Patch1:                %{name}-vserver.patch
 URL:           http://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
 BuildRequires: pam-devel
+BuildRequires: perl-base
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -30,16 +32,16 @@ Biblioteka, programy oraz strony manuala zawierające implementację
 Biblioteca para leitura e configuração de capabilities.
 
 %package libs
-Summary:       Libraries for libcap
-Summary(pl.UTF-8):     Biblioteki dla libcap
+Summary:       libcap library
+Summary(pl.UTF-8):     Biblioteka libcap
 Group:         Libraries
-Conflicts:     %{name} < 1:2.16-2
+Conflicts:     libcap < 1:2.16-2
 
 %description libs
-Libraries for libcap.
+libcap library.
 
 %description libs -l pl.UTF-8
-Biblioteki dla libcap.
+Biblioteka libcap.
 
 %package devel
 Summary:       Header files and development documentation for libcap
@@ -73,8 +75,7 @@ Statyczna biblioteka libcap.
 Summary:       Capability module for PAM
 Summary(pl.UTF-8):     Moduł PAM capability
 Group:         Libraries
-# -libs?
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      pam
 
 %description -n pam-pam_cap
@@ -86,11 +87,12 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
        CC="%{__cc}" \
-       OPT_CFLAGS="-Iinclude %{rpmcflags}" \
+       OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
        DEBUG= \
        OPT_LDFLAGS="%{rpmldflags}" \
        LDLIBS="-L../libcap -lcap"
@@ -99,29 +101,29 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       RAISE_SETFCAP=no \
        FAKEROOT=$RPM_BUILD_ROOT \
        lib=%{_lib}
 
 install -d $RPM_BUILD_ROOT/%{_lib}/security
-install pam_cap/pam_cap.so $RPM_BUILD_ROOT/%{_lib}/security
+install -p pam_cap/pam_cap.so $RPM_BUILD_ROOT/%{_lib}/security
 install -d $RPM_BUILD_ROOT/etc/security
-install pam_cap/capability.conf $RPM_BUILD_ROOT/etc/security
+cp -a pam_cap/capability.conf $RPM_BUILD_ROOT/etc/security
 
 install -d $RPM_BUILD_ROOT%{_libdir}
-install libcap/libcap.a $RPM_BUILD_ROOT%{_libdir}
+cp -a libcap/libcap.a $RPM_BUILD_ROOT%{_libdir}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcap.so.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libcap.so
-rm $RPM_BUILD_ROOT/%{_lib}/libcap.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libcap.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libcap.a
 
-# newer versions exist in man-pages
-# and these syscalls are specific to Linux/glibc, not libcap
-rm -f $RPM_BUILD_ROOT%{_mandir}/man2/cap{get,set}.2
+chmod a+x $RPM_BUILD_ROOT/%{_lib}/*.so*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -130,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/getcap
 %attr(755,root,root) %{_sbindir}/getpcaps
 %attr(755,root,root) %{_sbindir}/setcap
+%{_mandir}/man1/capsh.1*
 %{_mandir}/man8/getcap.8*
 %{_mandir}/man8/setcap.8*