Hello community, here is the log from the commit of package deltarpm for openSUSE:Factory checked in at 2018-01-16 09:30:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deltarpm (Old) and /work/SRC/openSUSE:Factory/.deltarpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deltarpm" Tue Jan 16 09:30:43 2018 rev:29 rq:562479 version:3.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/deltarpm/deltarpm.changes 2017-11-14 12:41:12.814082091 +0100 +++ /work/SRC/openSUSE:Factory/.deltarpm.new/deltarpm.changes 2018-01-16 09:30:45.166310508 +0100 @@ -1,0 +2,6 @@ +Fri Jan 5 11:36:43 UTC 2018 - [email protected] + +- Make python2 and python3 conditional to ensure we can build with + python3 only + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.vujAQy/_old 2018-01-16 09:30:45.802280753 +0100 +++ /var/tmp/diff_new_pack.vujAQy/_new 2018-01-16 09:30:45.806280565 +0100 @@ -1,7 +1,7 @@ # # spec file for package deltarpm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ # +%bcond_without python2 +%bcond_without python3 # we need to build against recent rpm, so avoid the new payload %define _binary_payload w9.bzdio Name: deltarpm @@ -27,8 +29,12 @@ Url: https://github.com/rpm-software-management/deltarpm/ Source: deltarpm-3.6.1.tar.bz2 BuildRequires: libbz2-devel +%if %{with python2} BuildRequires: python2-devel +%endif +%if %{with python3} BuildRequires: python3-devel +%endif BuildRequires: rpm-devel BuildRequires: xz-devel @@ -39,6 +45,7 @@ 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 python2-deltarpm Summary: Tools to Create and Apply deltarpms Group: Development/Languages/Python @@ -64,12 +71,25 @@ make CC="gcc" CFLAGS="%{optflags}" rpmdumpheader="%{_prefix}/lib/rpm/rpmdumpheader" %{?_smp_mflags} all python %install +PYS="" +%if %{with python2} +PYS="$PYS python" +%endif +%if %{with python3} +PYS="$PYS python3" +%endif + mkdir -p %{buildroot}%{_prefix}/lib/rpm -make DESTDIR=%{buildroot} prefix="%{_prefix}" libdir="%{_libdir}" mandir="%{_mandir}" rpmdumpheader="%{_prefix}/lib/rpm/rpmdumpheader" PYTHONS="python python3" install +make install DESTDIR=%{buildroot} \ + prefix="%{_prefix}" libdir="%{_libdir}" mandir="%{_mandir}" \ + rpmdumpheader="%{_prefix}/lib/rpm/rpmdumpheader" PYTHONS="$PYS" +%if %{with python2} 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 - +%endif +%if %{with python3} mv %{buildroot}%{python3_sitearch}/_deltarpm{module,}.so # Fix binary Python 3 module name +%endif %files %doc README LICENSE.BSD @@ -77,12 +97,16 @@ %{_mandir}/man8/* %{_prefix}/lib/rpm/rpmdumpheader +%if %{with python2} %files -n python2-deltarpm %{python_sitearch}/deltarpm.py %{python_sitearch}/_deltarpm.so +%endif +%if %{with python3} %files -n python3-deltarpm %{python3_sitearch}/deltarpm.py %{python3_sitearch}/_deltarpm.so +%endif %changelog
