Hello community, here is the log from the commit of package deltarpm for openSUSE:Factory checked in at 2017-11-14 12:41:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deltarpm (Old) and /work/SRC/openSUSE:Factory/.deltarpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deltarpm" Tue Nov 14 12:41:12 2017 rev:28 rq:540501 version:3.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/deltarpm/deltarpm.changes 2015-12-01 09:16:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.deltarpm.new/deltarpm.changes 2017-11-14 12:41:12.814082091 +0100 @@ -1,0 +2,13 @@ +Fri Nov 10 09:30:12 UTC 2017 - [email protected] + +- Correct provides/obsoletes for python2 subpackage + +------------------------------------------------------------------- +Tue Nov 7 11:36:52 UTC 2017 - [email protected] + +- Build python3 bindings as well +- Rename python2 subpackage to name consistent with current python + packaging +- Drop patch.sles8 - there does not seem to be any reason for it + +------------------------------------------------------------------- Old: ---- patch.sles8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.JDtwdW/_old 2017-11-14 12:41:13.498057072 +0100 +++ /var/tmp/diff_new_pack.JDtwdW/_new 2017-11-14 12:41:13.502056926 +0100 @@ -1,7 +1,7 @@ # # spec file for package deltarpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,6 +16,8 @@ # +# we need to build against recent rpm, so avoid the new payload +%define _binary_payload w9.bzdio Name: deltarpm Version: 3.6.1 Release: 0 @@ -24,15 +26,11 @@ Group: System/Packages Url: https://github.com/rpm-software-management/deltarpm/ Source: deltarpm-3.6.1.tar.bz2 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch0: patch.sles8 BuildRequires: libbz2-devel -BuildRequires: python-devel +BuildRequires: python2-devel +BuildRequires: python3-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 %description This package contains tools to create and apply deltarpms. A deltarpm @@ -41,43 +39,50 @@ 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 +%package -n python2-deltarpm Summary: Tools to Create and Apply deltarpms Group: Development/Languages/Python +Provides: python-deltarpm = %{version}-%{release} +Obsoletes: python-deltarpm < %{version}-%{release} 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 +%description -n python2-deltarpm +Python 2 bindings for deltarpm + +%package -n python3-deltarpm +Summary: Tools to Create and Apply deltarpms +Group: Development/Languages/Python +Requires: %{name} = %{version} + +%description -n python3-deltarpm +Python 3 bindings for deltarpm %prep %setup -q -%if 0%{?suse_version} < 900 -%patch0 -%endif %build -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 +make CC="gcc" CFLAGS="%{optflags}" rpmdumpheader="%{_prefix}/lib/rpm/rpmdumpheader" %{?_smp_mflags} all python %install mkdir -p %{buildroot}%{_prefix}/lib/rpm -make DESTDIR=%{buildroot} prefix="%{_prefix}" libdir="%{_libdir}" mandir="%{_mandir}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" PYTHONS="python" 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 +make DESTDIR=%{buildroot} prefix="%{_prefix}" libdir="%{_libdir}" mandir="%{_mandir}" rpmdumpheader="%{_prefix}/lib/rpm/rpmdumpheader" PYTHONS="python python3" install +rm -rf %{buildroot}%{_libdir}/python/site-packages/{_deltarpmmodule.so,deltarpm.py} # Remove wrongly installed Python 2 module +mv %{buildroot}%{python_sitearch}/_deltarpm{module,}.so # Fix binary Python 2 module name + +mv %{buildroot}%{python3_sitearch}/_deltarpm{module,}.so # Fix binary Python 3 module name %files -%defattr(-,root,root) %doc README LICENSE.BSD %{_bindir}/* %{_mandir}/man8/* %{_prefix}/lib/rpm/rpmdumpheader -%files -n python-deltarpm -%defattr(-,root,root) +%files -n python2-deltarpm %{python_sitearch}/deltarpm.py %{python_sitearch}/_deltarpm.so +%files -n python3-deltarpm +%{python3_sitearch}/deltarpm.py +%{python3_sitearch}/_deltarpm.so + %changelog
