diff --git a/libcap-ng-0.7.3.tar.gz b/libcap-ng-0.7.3.tar.gz deleted file mode 100644 index cbdf7b3..0000000 --- a/libcap-ng-0.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1 -size 392613 diff --git a/libcap-ng-0.7.4.tar.gz b/libcap-ng-0.7.4.tar.gz new file mode 100644 index 0000000..754573d --- /dev/null +++ b/libcap-ng-0.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b +size 407007 diff --git a/libcap-ng-python.changes b/libcap-ng-python.changes index f4c293c..0584274 100644 --- a/libcap-ng-python.changes +++ b/libcap-ng-python.changes @@ -1,5 +1,16 @@ ------------------------------------------------------------------- -Thu Mar 14 09:30:13 UTC 2013 - meissner@suse.com +Thu May 15 13:19:57 UTC 2014 - tchvatal@suse.com + +- Version bupm to 0.7.4 +- Cleanup with spec-cleaner +- Remove useless specification of attributes +- Really split the two spec files instead of copying them to avoid + the huge ifdefing. + + more readable + - version must be edited in two places when bumping + +------------------------------------------------------------------- +Thu Mar 14 09:30:04 UTC 2013 - meissner@suse.com - use source url diff --git a/libcap-ng-python.spec b/libcap-ng-python.spec index 3eb0c6f..9f2e003 100644 --- a/libcap-ng-python.spec +++ b/libcap-ng-python.spec @@ -1,7 +1,7 @@ # # spec file for package libcap-ng-python # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,146 +16,56 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - +%define soname 0 +Name: libcap-ng-python +Version: 0.7.4 +Release: 0 Summary: An alternate POSIX capabilities library License: LGPL-2.1+ Group: System/Libraries - -Name: libcap-ng-python -Version: 0.7.3 -Release: 0 -%define soname 0 -%define rname libcap-ng Url: http://people.redhat.com/sgrubb/libcap-ng Source0: http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz -Source1: pre_checkin.sh -Source2: baselibs.conf +Source1: baselibs.conf Source99: libcap-ng.rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: kernel-headers >= 2.6.11 BuildRequires: libattr-devel BuildRequires: pkg-config BuildRequires: python-base +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libcap-ng is a library that makes using posix capabilities easier -%if "%{name}" == "%{rname}" - -%package -n %{name}%{soname} - -Summary: An alternate POSIX capabilities library -License: LGPL-2.1+ -Group: System/Libraries - -%description -n %{name}%{soname} -Libcap-ng is a library that makes using posix capabilities easier - -%package devel - -Summary: Header files for libcap-ng library -License: LGPL-2.1+ -Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version} -Requires: kernel-headers >= 2.6.11 -Requires: pkgconfig - -%description devel -The libcap-ng-devel package contains the files needed for developing -applications that need to use the libcap-ng library. - -%package utils - -Summary: Utilities for analysing and setting file capabilities -License: GPL-2.0+ -Group: System/Base - -%description utils -The libcap-ng-utils package contains applications to analyse the -posix capabilities of all the program running on a system. It also -lets you set the file system based capabilities. - -%else - %package -n python-capng Summary: Python bindings for libcap-ng library -License: LGPL-2.1+ Group: Development/Libraries/Python +BuildRequires: libcap-ng-devel = %{version} BuildRequires: python-devel BuildRequires: swig -Requires: %{rname}%{soname} = %{version} -%py_requires +Requires: libcap-ng%{soname} = %{version} +%{py_requires} %description -n python-capng The libcap-ng-python package contains the bindings so that libcap-ng and can be used by python applications. -%endif - %prep -%setup -q -n %{rname}-%{version} +%setup -q -n libcap-ng-%{version} %build -%configure --disable-static --with-pic --with-python=yes -%__make %{?_smp_mflags} +%configure \ + --disable-static \ + --with-pic \ + --with-python +make %{?_smp_mflags} %install -%__make DESTDIR="%{buildroot}" install - -# Remove a couple things so they don't get picked up -find %{buildroot} -type f -name "*.la" -print -delete - -%if "%{name}" == "%{rname}-python" -%__rm -f %{buildroot}%{_libdir}/lib*.so* -%__rm -f %{buildroot}%{_libdir}/lib*.so* -%__rm -rf %{buildroot}%{_libdir}/pkgconfig -%__rm -rf %{buildroot}%{_bindir} -%__rm -rf %{buildroot}%{_mandir} -%__rm -rf %{buildroot}%{_includedir} -%__rm -rf %{buildroot}%{_datadir}/aclocal -%endif - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%if "%{name}" == "%{rname}" - -%post -n %{name}%{soname} -p /sbin/ldconfig - -%postun -n %{name}%{soname} -p /sbin/ldconfig - -%files -n %{name}%{soname} -%defattr(-,root,root,-) -%doc COPYING.LIB -%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname} -%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.* - -%files devel -%defattr(-,root,root,-) -%attr(0644,root,root) %{_mandir}/man3/*.3%{ext_man} -%attr(0644,root,root) %{_includedir}/cap-ng.h -%attr(0755,root,root) %{_libdir}/%{rname}.so -%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4 -%{_libdir}/pkgconfig/%{rname}.pc - -%files utils -%defattr(-,root,root,-) -%doc COPYING -%attr(0755,root,root) %{_bindir}/captest -%attr(0755,root,root) %{_bindir}/filecap -%attr(0755,root,root) %{_bindir}/netcap -%attr(0755,root,root) %{_bindir}/pscap -%attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man} - -%else +make DESTDIR=%{buildroot} install %{?_smp_mflags} -C bindings/python +find %{buildroot} -type f -name "*.la" -delete -print %files -n python-capng %defattr(-,root,root,-) -%attr(755,root,root) %{python_sitearch}/_capng.so +%{python_sitearch}/_capng.so %{python_sitearch}/capng.py* -%endif - %changelog diff --git a/libcap-ng.changes b/libcap-ng.changes index 8fb8c70..0584274 100644 --- a/libcap-ng.changes +++ b/libcap-ng.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 15 13:19:57 UTC 2014 - tchvatal@suse.com + +- Version bupm to 0.7.4 +- Cleanup with spec-cleaner +- Remove useless specification of attributes +- Really split the two spec files instead of copying them to avoid + the huge ifdefing. + + more readable + - version must be edited in two places when bumping + ------------------------------------------------------------------- Thu Mar 14 09:30:04 UTC 2013 - meissner@suse.com diff --git a/libcap-ng.spec b/libcap-ng.spec index 539e70f..0c27ca2 100644 --- a/libcap-ng.spec +++ b/libcap-ng.spec @@ -1,7 +1,7 @@ # # spec file for package libcap-ng # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,26 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - +%define soname 0 +Name: libcap-ng +Version: 0.7.4 +Release: 0 Summary: An alternate POSIX capabilities library License: LGPL-2.1+ Group: System/Libraries - -Name: libcap-ng -Version: 0.7.3 -Release: 0 -%define soname 0 -%define rname libcap-ng Url: http://people.redhat.com/sgrubb/libcap-ng Source0: http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz -Source1: pre_checkin.sh -Source2: baselibs.conf +Source1: baselibs.conf Source99: libcap-ng.rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: kernel-headers >= 2.6.11 BuildRequires: libattr-devel BuildRequires: pkg-config -BuildRequires: python-base +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libcap-ng is a library that makes using posix capabilities easier -%if "%{name}" == "%{rname}" - %package -n %{name}%{soname} - Summary: An alternate POSIX capabilities library License: LGPL-2.1+ Group: System/Libraries @@ -54,7 +44,6 @@ Group: System/Libraries Libcap-ng is a library that makes using posix capabilities easier %package devel - Summary: Header files for libcap-ng library License: LGPL-2.1+ Group: Development/Libraries/C and C++ @@ -67,7 +56,6 @@ The libcap-ng-devel package contains the files needed for developing applications that need to use the libcap-ng library. %package utils - Summary: Utilities for analysing and setting file capabilities License: GPL-2.0+ Group: System/Base @@ -77,50 +65,19 @@ The libcap-ng-utils package contains applications to analyse the posix capabilities of all the program running on a system. It also lets you set the file system based capabilities. -%else - -%package -n python-capng -Summary: Python bindings for libcap-ng library -License: LGPL-2.1+ -Group: Development/Libraries/Python -BuildRequires: python-devel -BuildRequires: swig -Requires: %{rname}%{soname} = %{version} -%py_requires - -%description -n python-capng -The libcap-ng-python package contains the bindings so that libcap-ng -and can be used by python applications. - -%endif - %prep -%setup -q -n %{rname}-%{version} +%setup -q %build -%configure --disable-static --with-pic --with-python=no -%__make %{?_smp_mflags} +%configure \ + --disable-static \ + --with-pic \ + --without-python +make %{?_smp_mflags} %install -%__make DESTDIR="%{buildroot}" install - -# Remove a couple things so they don't get picked up -find %{buildroot} -type f -name "*.la" -print -delete - -%if "%{name}" == "%{rname}-python" -%__rm -f %{buildroot}%{_libdir}/lib*.so* -%__rm -f %{buildroot}%{_libdir}/lib*.so* -%__rm -rf %{buildroot}%{_libdir}/pkgconfig -%__rm -rf %{buildroot}%{_bindir} -%__rm -rf %{buildroot}%{_mandir} -%__rm -rf %{buildroot}%{_includedir} -%__rm -rf %{buildroot}%{_datadir}/aclocal -%endif - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%if "%{name}" == "%{rname}" +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{name}%{soname} -p /sbin/ldconfig @@ -129,33 +86,24 @@ find %{buildroot} -type f -name "*.la" -print -delete %files -n %{name}%{soname} %defattr(-,root,root,-) %doc COPYING.LIB -%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname} -%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.* +%{_libdir}/%{name}.so.%{soname} +%{_libdir}/%{name}.so.%{soname}.* %files devel %defattr(-,root,root,-) -%attr(0644,root,root) %{_mandir}/man3/*.3%{ext_man} -%attr(0644,root,root) %{_includedir}/cap-ng.h -%attr(0755,root,root) %{_libdir}/%{rname}.so -%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4 -%{_libdir}/pkgconfig/%{rname}.pc +%{_mandir}/man3/*.3%{ext_man} +%{_includedir}/cap-ng.h +%{_libdir}/%{name}.so +%{_datadir}/aclocal/cap-ng.m4 +%{_libdir}/pkgconfig/%{name}.pc %files utils %defattr(-,root,root,-) %doc COPYING -%attr(0755,root,root) %{_bindir}/captest -%attr(0755,root,root) %{_bindir}/filecap -%attr(0755,root,root) %{_bindir}/netcap -%attr(0755,root,root) %{_bindir}/pscap -%attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man} - -%else - -%files -n python-capng -%defattr(-,root,root,-) -%attr(755,root,root) %{python_sitearch}/_capng.so -%{python_sitearch}/capng.py* - -%endif +%{_bindir}/captest +%{_bindir}/filecap +%{_bindir}/netcap +%{_bindir}/pscap +%{_mandir}/man8/*.8%{ext_man} %changelog diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 4440557..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -echo -n "Generating python spec " - -cp libcap-ng.spec libcap-ng-python.spec -cp libcap-ng.changes libcap-ng-python.changes - -perl -pi -e "s/^Name:.*libcap-ng$/Name: libcap-ng-python/" libcap-ng-python.spec - -echo "Done." -