X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libcap.spec;h=d1404afb0ca09333f7a4355d5f81f85732a19ef5;hb=14300c6331e17fe9aaf6c6af04303a690eaba495;hp=88f554b83e83fb740b751350bbb2fdaa562ed890;hpb=49eb74d96239c3e927795cfaa83d2a07efe657b1;p=packages%2Flibcap.git

diff --git a/libcap.spec b/libcap.spec
index 88f554b..d1404af 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -2,17 +2,22 @@ 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:	1
+Version:	2.24
+Release:	2
 Epoch:		1
-License:	GPL or BSD
+License:	GPL v2 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:	https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
+# Source0-md5:	d43ab9f680435a7fff35b4ace8d45b80
 Patch0:		%{name}-make.patch
-URL:		http://sites.google.com/site/fullycapable/
+Patch1:		no-linux-xattr.patch
+URL:		https://sites.google.com/site/fullycapable/
 BuildRequires:	attr-devel
 BuildRequires:	pam-devel
+BuildRequires:	perl-base
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir		/sbin
@@ -28,12 +33,24 @@ Biblioteka, programy oraz strony manuala zawierające implementację
 %description -l pt_BR.UTF-8
 Biblioteca para leitura e configuração de capabilities.
 
+%package libs
+Summary:	libcap library
+Summary(pl.UTF-8):	Biblioteka libcap
+Group:		Libraries
+Conflicts:	libcap < 1:2.16-2
+
+%description libs
+libcap library.
+
+%description libs -l pl.UTF-8
+Biblioteka libcap.
+
 %package devel
 Summary:	Header files and development documentation for libcap
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do libcap
 Summary(pt_BR.UTF-8):	Arquivos de desenvolvimento para capabilities
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files and development documentation for libcap.
@@ -60,7 +77,7 @@ Statyczna biblioteka libcap.
 Summary:	Capability module for PAM
 Summary(pl.UTF-8):	Moduł PAM capability
 Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	pam
 
 %description -n pam-pam_cap
@@ -72,11 +89,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"
@@ -85,29 +103,28 @@ 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}
 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
+%{__mv} $RPM_BUILD_ROOT/%{_lib}/libcap.a $RPM_BUILD_ROOT%{_libdir}
 
-# 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)
@@ -116,15 +133,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/getcap
 %attr(755,root,root) %{_sbindir}/getpcaps
 %attr(755,root,root) %{_sbindir}/setcap
-%attr(755,root,root) /%{_lib}/libcap.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libcap.so.2
+%{_mandir}/man1/capsh.1*
 %{_mandir}/man8/getcap.8*
 %{_mandir}/man8/setcap.8*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libcap.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libcap.so.2
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcap.so
 %{_includedir}/sys/capability.h
+%{_pkgconfigdir}/libcap.pc
 %{_mandir}/man3/libcap*.3*
 %{_mandir}/man3/cap_*
 %{_mandir}/man3/capgetp.3*