Hello community, here is the log from the commit of package libcap-ng for openSUSE:Factory checked in at 2012-02-15 16:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcap-ng (Old) and /work/SRC/openSUSE:Factory/.libcap-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcap-ng", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libcap-ng/libcap-ng-python.changes 2011-09-23 02:07:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcap-ng.new/libcap-ng-python.changes 2012-02-15 16:16:17.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Feb 12 17:25:23 UTC 2012 - [email protected] + +- Move libraries back to %{_libdir}, /usr merge project + +------------------------------------------------------------------- +Wed Oct 5 15:06:00 UTC 2011 - [email protected] + +- cross-build workaround: make sure no attempt is made to build + python stuff even if it's installed on the host system + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libcap-ng/libcap-ng.changes 2011-10-07 00:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcap-ng.new/libcap-ng.changes 2012-02-15 16:16:17.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 12 17:24:55 UTC 2012 - [email protected] + +- Move libraries back to %{_libdir}, /usr merge project + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcap-ng-python.spec ++++++ --- /var/tmp/diff_new_pack.jMb0T1/_old 2012-02-15 16:16:18.000000000 +0100 +++ /var/tmp/diff_new_pack.jMb0T1/_new 2012-02-15 16:16:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcap-ng-python # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,14 +20,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: An alternate POSIX capabilities library +License: LGPL-2.1+ +Group: System/Libraries Name: libcap-ng-python Version: 0.6.6 -Release: 1 +Release: 0 %define soname 0 %define rname libcap-ng -License: LGPL-2.1+ -Group: System/Libraries Url: http://people.redhat.com/sgrubb/libcap-ng # http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz Source0: libcap-ng-%{version}.tar.bz2 @@ -36,7 +36,9 @@ Source99: libcap-ng.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: kernel-headers >= 2.6.11 -BuildRequires: libattr-devel pkg-config python-base +BuildRequires: libattr-devel +BuildRequires: pkg-config +BuildRequires: python-base %description Libcap-ng is a library that makes using posix capabilities easier @@ -82,7 +84,8 @@ Summary: Python bindings for libcap-ng library License: LGPL-2.1+ Group: Development/Libraries/Python -BuildRequires: python-devel swig +BuildRequires: python-devel +BuildRequires: swig Requires: %{rname}%{soname} = %{version} %py_requires @@ -96,36 +99,23 @@ %setup -q -n %{rname}-%{version} %build -%configure --libdir="/%{_lib}" +%configure --disable-static --with-pic --with-python=yes %__make %{?_smp_mflags} %install %__make DESTDIR="%{buildroot}" install -# Move the symlink -%__rm -f "%{buildroot}/%{_lib}/%{rname}.so" -%__mkdir_p "%{buildroot}%{_libdir}" -VLIBNAME=$(/bin/ls -1 "%{buildroot}/%{_lib}/%{rname}.so".*.*.*) -[ -n "$VLIBNAME" ] || { echo "ERROR: failed to find %{buildroot}/%{_lib}/%{rname}.so.*.*.*" >&2; exit 1; } -LIBNAME=$(basename "$VLIBNAME") -%__ln_s "../../%{_lib}/$LIBNAME" "%{buildroot}%{_libdir}/%{rname}.so" - -# Move the pkgconfig file -%__install -d "%{buildroot}%{_libdir}" -%__mv "%{buildroot}/%{_lib}/pkgconfig" "%{buildroot}%{_libdir}/pkgconfig" - # Remove a couple things so they don't get picked up -%__rm -f "%{buildroot}/%{_lib}/%{rname}".{a,la} -%__rm -f "%{buildroot}%{python_sitearch}/_capng".{a,la} +find %{buildroot} -type f -name "*.la" -print -delete %if "%{name}" == "%{rname}-python" -%__rm -f %{buildroot}/%{_lib}/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 +%__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 @@ -140,8 +130,8 @@ %files -n %{name}%{soname} %defattr(-,root,root,-) %doc COPYING.LIB -%attr(0755,root,root) /%{_lib}/%{rname}.so.%{soname} -%attr(0755,root,root) /%{_lib}/%{rname}.so.%{soname}.* +%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname} +%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.* %files devel %defattr(-,root,root,-) ++++++ libcap-ng.spec ++++++ --- /var/tmp/diff_new_pack.jMb0T1/_old 2012-02-15 16:16:18.000000000 +0100 +++ /var/tmp/diff_new_pack.jMb0T1/_new 2012-02-15 16:16:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libcap-ng # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,14 +20,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: An alternate POSIX capabilities library +License: LGPL-2.1+ +Group: System/Libraries Name: libcap-ng Version: 0.6.6 -Release: 1 +Release: 0 %define soname 0 %define rname libcap-ng -License: LGPL-2.1+ -Group: System/Libraries Url: http://people.redhat.com/sgrubb/libcap-ng # http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz Source0: libcap-ng-%{version}.tar.bz2 @@ -36,7 +36,9 @@ Source99: libcap-ng.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: kernel-headers >= 2.6.11 -BuildRequires: libattr-devel pkg-config python-base +BuildRequires: libattr-devel +BuildRequires: pkg-config +BuildRequires: python-base %description Libcap-ng is a library that makes using posix capabilities easier @@ -82,7 +84,8 @@ Summary: Python bindings for libcap-ng library License: LGPL-2.1+ Group: Development/Libraries/Python -BuildRequires: python-devel swig +BuildRequires: python-devel +BuildRequires: swig Requires: %{rname}%{soname} = %{version} %py_requires @@ -96,36 +99,23 @@ %setup -q -n %{rname}-%{version} %build -%configure --libdir="/%{_lib}" --with-python=no +%configure --disable-static --with-pic --with-python=no %__make %{?_smp_mflags} %install %__make DESTDIR="%{buildroot}" install -# Move the symlink -%__rm -f "%{buildroot}/%{_lib}/%{rname}.so" -%__mkdir_p "%{buildroot}%{_libdir}" -VLIBNAME=$(/bin/ls -1 "%{buildroot}/%{_lib}/%{rname}.so".*.*.*) -[ -n "$VLIBNAME" ] || { echo "ERROR: failed to find %{buildroot}/%{_lib}/%{rname}.so.*.*.*" >&2; exit 1; } -LIBNAME=$(basename "$VLIBNAME") -%__ln_s "../../%{_lib}/$LIBNAME" "%{buildroot}%{_libdir}/%{rname}.so" - -# Move the pkgconfig file -%__install -d "%{buildroot}%{_libdir}" -%__mv "%{buildroot}/%{_lib}/pkgconfig" "%{buildroot}%{_libdir}/pkgconfig" - # Remove a couple things so they don't get picked up -%__rm -f "%{buildroot}/%{_lib}/%{rname}".{a,la} -%__rm -f "%{buildroot}%{python_sitearch}/_capng".{a,la} +find %{buildroot} -type f -name "*.la" -print -delete %if "%{name}" == "%{rname}-python" -%__rm -f %{buildroot}/%{_lib}/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 +%__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 @@ -140,8 +130,8 @@ %files -n %{name}%{soname} %defattr(-,root,root,-) %doc COPYING.LIB -%attr(0755,root,root) /%{_lib}/%{rname}.so.%{soname} -%attr(0755,root,root) /%{_lib}/%{rname}.so.%{soname}.* +%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname} +%attr(0755,root,root) %{_libdir}/%{rname}.so.%{soname}.* %files devel %defattr(-,root,root,-) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
