Hello community, here is the log from the commit of package deltarpm for openSUSE:Factory checked in at 2012-01-27 15:17:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deltarpm (Old) and /work/SRC/openSUSE:Factory/.deltarpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deltarpm", Maintainer is "mls@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/deltarpm/deltarpm.changes 2011-10-04 18:08:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deltarpm.new/deltarpm.changes 2012-01-27 15:17:14.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 25 16:18:13 UTC 2012 - saschpe@suse.de + +- Package binary Python module, python-deltarpm isn't noarch any more + +------------------------------------------------------------------- +Mon Jan 23 16:20:45 UTC 2012 - saschpe@suse.de + +- Run spec-cleaner +- Add python-deltarpm subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.2YViGg/_old 2012-01-27 15:17:15.000000000 +0100 +++ /var/tmp/diff_new_pack.2YViGg/_new 2012-01-27 15:17:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package deltarpm # -# 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 @@ -15,18 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: deltarpm -BuildRequires: libbz2-devel rpm-devel xz-devel -Url: ftp://ftp.suse.com/pub/projects/deltarpm -License: BSD-3-Clause -Group: System/Packages Version: 3.5.git -Release: 1 +Release: 0 Summary: Tools to Create and Apply deltarpms +License: BSD-3-Clause +Group: System/Packages +Url: ftp://ftp.suse.com/pub/projects/deltarpm Source: deltarpm-3.5.git.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: patch.sles8 +BuildRequires: libbz2-devel +BuildRequires: python-devel +BuildRequires: rpm-devel +BuildRequires: xz-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # we need to build against recent rpm, so avoid the new payload %define _binary_payload w9.bzdio @@ -38,26 +40,43 @@ the old one. You do not need to have a copy of the old RPM, because deltarpms can also work with installed RPMs. +%package -n python-deltarpm +Summary: Tools to Create and Apply deltarpms +Group: Development/Languages/Python +Requires: %{name} = %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif + +%description -n python-deltarpm +Python bindings for deltarpm + %prep -%setup -%if %suse_version < 900 +%setup -q +%if 0%{?suse_version} < 900 %patch0 %endif %build -make CC="%__cc" CFLAGS="$RPM_OPT_FLAGS" prefix="%{_prefix}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" %{?_smp_mflags} +make CC="gcc" CFLAGS="%{optflags}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" %{?_smp_mflags} +make CC="gcc" CFLAGS="%{optflags}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" %{?_smp_mflags} python %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm -make DESTDIR=$RPM_BUILD_ROOT prefix="%{_prefix}" mandir="%{_mandir}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" install +mkdir -p %{buildroot}%{_prefix}/lib/rpm +make DESTDIR=%{buildroot} prefix="%{_prefix}" libdir="%{_libdir}" mandir="%{_mandir}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" install +rm -rf %{buildroot}%{_libdir}/python/site-packages/{_deltarpmmodule.so,deltarpm.py} # Remove wrongly installed Python module +mv %{buildroot}%{python_sitearch}/_deltarpm{module,}.so # Fix binary Python module name %files %defattr(-,root,root) %doc README LICENSE.BSD %{_bindir}/* %{_mandir}/man8/* -%if %suse_version >= 900 -/usr/lib/rpm/rpmdumpheader -%endif +%{_prefix}/lib/rpm/rpmdumpheader + +%files -n python-deltarpm +%defattr(-,root,root) +%{python_sitearch}/deltarpm.py +%{python_sitearch}/_deltarpm.so %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org