Hello community, here is the log from the commit of package zypp-plugin for openSUSE:Factory checked in at 2020-11-02 09:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypp-plugin (Old) and /work/SRC/openSUSE:Factory/.zypp-plugin.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypp-plugin" Mon Nov 2 09:40:04 2020 rev:16 rq:844816 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/zypp-plugin/zypp-plugin.changes 2018-07-13 10:15:05.962009884 +0200 +++ /work/SRC/openSUSE:Factory/.zypp-plugin.new.3463/zypp-plugin.changes 2020-11-02 09:40:10.393597249 +0100 @@ -1,0 +2,6 @@ +Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- singlespec in Tumbleweed must support multiple python3 flavors + in the future gh#openSUSE/python-rpm-macros#66 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypp-plugin.spec ++++++ --- /var/tmp/diff_new_pack.6MfcTt/_old 2020-11-02 09:40:10.997597829 +0100 +++ /var/tmp/diff_new_pack.6MfcTt/_new 2020-11-02 09:40:11.001597833 +0100 @@ -1,7 +1,7 @@ # # spec file for package zypp-plugin # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,15 +22,16 @@ Version: 0.6.3 Release: 0 Summary: Helper that makes writing ZYpp plugins easier -License: GPL-2.0 +License: GPL-2.0-only Group: System/Packages -Url: https://github.com/openSUSE/zypp-plugin +URL: https://github.com/openSUSE/zypp-plugin Source0: %{name}-%{version}.tar.bz2 BuildArch: noarch %if %{singlespec_py3} %{?!python_module:%define python_module() python-%{**} python3-%{**}} BuildRequires: %{python_module devel} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-base # provide old names for py2 package @@ -62,6 +63,16 @@ : %install +%if %{singlespec_py3} +%{python_expand # +mkdir -p %{buildroot}%{$python_sitelib} +install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py +# TODO: replace by $python_compileall as soon as it is available sr#843481 +$python -m compileall %{buildroot}%{$python_sitelib} +$python -O -m compileall %{buildroot}%{$python_sitelib} +%fdupes %{buildroot}%{$python_sitelib} +} +%else %if 0%{?have_python2} mkdir -p %{buildroot}%{python_sitelib} install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py @@ -72,11 +83,13 @@ install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py %py3_compile -O %{buildroot}/%{python3_sitelib} %endif +%endif %if %{singlespec_py3} %files %{python_files} %doc COPYING -%{python_sitelib}/* +%{python_sitelib}/zypp_plugin* +%pycache_only %{python_sitelib}/__pycache__/* ### ---------------------------------------- ### SLE-12* and even older ++++++ zypp-plugin-0.6.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.changes new/zypp-plugin/package/zypp-plugin.changes --- old/zypp-plugin/package/zypp-plugin.changes 2018-03-13 15:05:02.000000000 +0100 +++ new/zypp-plugin/package/zypp-plugin.changes 2020-10-28 15:54:54.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- singlespec in Tumbleweed must support multiple python3 flavors + in the future gh#openSUSE/python-rpm-macros#66 + +------------------------------------------------------------------- Tue Mar 13 14:51:18 CET 2018 - m...@suse.com - Provide python3-zypp-plugin down to SLE12 (bsc#1081596) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-plugin/package/zypp-plugin.spec new/zypp-plugin/package/zypp-plugin.spec --- old/zypp-plugin/package/zypp-plugin.spec 2018-03-13 15:05:02.000000000 +0100 +++ new/zypp-plugin/package/zypp-plugin.spec 2020-10-28 15:54:54.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define singlespec_py3 ( 0%{?suse_version} > 1330 ) Name: zypp-plugin @@ -31,6 +32,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} BuildRequires: %{python_module devel} BuildRequires: python-rpm-macros +BuildRequires: fdupes Requires: python-base # provide old names for py2 package %if "%{python_flavor}" == "python2" @@ -61,6 +63,16 @@ : %install +%if %{singlespec_py3} +%{python_expand # +mkdir -p %{buildroot}%{$python_sitelib} +install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py +# TODO: replace by $python_compileall as soon as it is available sr#843481 +$python -m compileall %{buildroot}%{$python_sitelib} +$python -O -m compileall %{buildroot}%{$python_sitelib} +%fdupes %{buildroot}%{$python_sitelib} +} +%else %if 0%{?have_python2} mkdir -p %{buildroot}%{python_sitelib} install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py @@ -71,11 +83,13 @@ install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py %py3_compile -O %{buildroot}/%{python3_sitelib} %endif +%endif %if %{singlespec_py3} %files %{python_files} %doc COPYING -%{python_sitelib}/* +%{python_sitelib}/zypp_plugin* +%pycache_only %{python_sitelib}/__pycache__/* ### ---------------------------------------- ### SLE-12* and even older
