Hello community,
here is the log from the commit of package zypp-plugin for openSUSE:Factory
checked in at 2018-01-25 12:38:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zypp-plugin (Old)
and /work/SRC/openSUSE:Factory/.zypp-plugin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypp-plugin"
Thu Jan 25 12:38:43 2018 rev:13 rq:568078 version:0.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/zypp-plugin/zypp-plugin.changes 2017-11-19
11:09:56.074574032 +0100
+++ /work/SRC/openSUSE:Factory/.zypp-plugin.new/zypp-plugin.changes
2018-01-25 12:38:44.895684097 +0100
@@ -1,0 +2,22 @@
+Fri Jan 19 15:15:38 CET 2018 - m...@suse.de
+
+- Disable singlespec packaging in SLE12* and older distros while it's
+ not working there. They provide python2 packages only.
+
+-------------------------------------------------------------------
+Wed Jan 3 15:53:28 UTC 2018 - tchva...@suse.com
+
+- Fix a bit the obsoletes/provides to allow migration, previously
+ was overwritten by macros
+- BR python-rpm-macros to build on older distributions
+- Fix bit python detection conditions on install phase to be better
+ readable and uniform
+
+-------------------------------------------------------------------
+Mon Dec 11 14:15:36 UTC 2017 - tchva...@suse.com
+
+- Switch to singlespec packaging to make it easy to disable either
+ python3 or python2 plugin and make sure all is buildable
+- version 0.6.3
+
+-------------------------------------------------------------------
Old:
----
zypp-plugin-0.6.2.tar.bz2
New:
----
zypp-plugin-0.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypp-plugin.spec ++++++
--- /var/tmp/diff_new_pack.cP1jtX/_old 2018-01-25 12:38:45.535654220 +0100
+++ /var/tmp/diff_new_pack.cP1jtX/_new 2018-01-25 12:38:45.535654220 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zypp-plugin
#
-# 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,74 +16,84 @@
#
-%if 0%{?suse_version} >= 1320
-%global build_py3 1
-%endif
+%define singlespec_py3 ( 0%{?suse_version} > 1330 )
Name: zypp-plugin
-Version: 0.6.2
+Version: 0.6.3
Release: 0
-Url: https://gitorious.org/opensuse/zypp-plugin
Summary: Helper that makes writing ZYpp plugins easier
License: GPL-2.0
Group: System/Packages
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: https://github.com/openSUSE/zypp-plugin
Source0: %{name}-%{version}.tar.bz2
-%if 0%{?suse_version} >= 1210
BuildArch: noarch
+
+%if %{singlespec_py3}
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+BuildRequires: %{python_module devel}
+BuildRequires: python-rpm-macros
+Requires: python-base
+# provide old names for py2 package
+%if "%{python_flavor}" == "python2"
+Obsoletes: zypp-plugin-python < %{version}-%{release}
+Provides: zypp-plugin-python = %{version}-%{release}
+%endif
+%python_subpackages
+### ----------------------------------------
+### SLE-12* and even older
+%else
+%define have_python2 1
+%define have_python3 0
%endif
+### ----------------------------------------
%description
-Empty main package. Helper for different languages reside in subpackages.
+This API allows writing ZYpp plugins by just subclassing from a python class
+and implementing the commands you want to respond to as python methods.
%prep
%setup -q -n zypp-plugin
%build
+:
%install
-%{__mkdir_p} %{buildroot}%{python_sitelib}
-%{__install} python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
+%if 0%{?have_python2}
+mkdir -p %{buildroot}%{python_sitelib}
+install python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
%py_compile -O %{buildroot}/%{python_sitelib}
-%if 0%{?build_py3}
-%{__mkdir_p} %{buildroot}%{python3_sitelib}
-%{__install} python/zypp_plugin.py
%{buildroot}%{python3_sitelib}/zypp_plugin.py
+%endif
+%if 0%{?have_python3}
+mkdir -p %{buildroot}%{python3_sitelib}
+install python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
%py3_compile -O %{buildroot}/%{python3_sitelib}
%endif
-%if 0%{?build_py3}
-%package -n python3-%{name}
-Summary: Helper that makes writing ZYpp plugins in python easier
-Group: System/Packages
-Requires: python3
-BuildRequires: python3-devel
-
-%description -n python3-%{name}
-This API allows writing ZYpp plugins by just subclassing from a python class
-and implementing the commands you want to respond to as python methods.
-%endif
+%if %{singlespec_py3}
+%files %{python_files}
+%doc COPYING
+%{python_sitelib}/*
-%package python
+### ----------------------------------------
+### SLE-12* and even older
+%else
+%package -n %{name}-python
Summary: Helper that makes writing ZYpp plugins in python easier
Group: System/Packages
-Provides: python2-%{name}
+Provides: python2-%{name} = %{version}-%{release}
BuildRequires: python-devel
Requires: python
-%description python
-This API allows writing ZYpp plugins by just subclassing from a python class
-and implementing the commands you want to respond to as python methods.
-
-%files python
+%files -n %{name}-python
%defattr(-,root,root)
%doc COPYING
%{python_sitelib}/*
-%if 0%{?build_py3}
-%files -n python3-%{name}
-%defattr(-,root,root)
-%doc COPYING
-%{python3_sitelib}/*
+%description -n %{name}-python
+This API allows writing ZYpp plugins by just subclassing from a python class
+and implementing the commands you want to respond to as python methods.
+
%endif
+### ----------------------------------------
%changelog
++++++ zypp-plugin-0.6.2.tar.bz2 -> 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 2017-11-09 17:48:00.000000000
+0100
+++ new/zypp-plugin/package/zypp-plugin.changes 2018-01-19 15:20:03.000000000
+0100
@@ -1,4 +1,26 @@
-------------------------------------------------------------------
+Fri Jan 19 15:15:38 CET 2018 - m...@suse.de
+
+- Disable singlespec packaging in SLE12* and older distros while it's
+ not working there. They provide python2 packages only.
+
+-------------------------------------------------------------------
+Wed Jan 3 15:53:28 UTC 2018 - tchva...@suse.com
+
+- Fix a bit the obsoletes/provides to allow migration, previously
+ was overwritten by macros
+- BR python-rpm-macros to build on older distributions
+- Fix bit python detection conditions on install phase to be better
+ readable and uniform
+
+-------------------------------------------------------------------
+Mon Dec 11 14:15:36 UTC 2017 - tchva...@suse.com
+
+- Switch to singlespec packaging to make it easy to disable either
+ python3 or python2 plugin and make sure all is buildable
+- version 0.6.3
+
+-------------------------------------------------------------------
Thu Nov 9 17:46:45 CET 2017 - m...@suse.de
- Don't use a shebang in the module
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 2017-11-09 17:48:00.000000000
+0100
+++ new/zypp-plugin/package/zypp-plugin.spec 2018-01-19 15:20:03.000000000
+0100
@@ -1,7 +1,7 @@
#
# spec file for package zypp-plugin
#
-# 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
@@ -15,74 +15,84 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%if 0%{?suse_version} >= 1320
-%global build_py3 1
-%endif
+%define singlespec_py3 ( 0%{?suse_version} > 1330 )
Name: zypp-plugin
-Version: 0.6.2
+Version: 0.6.3
Release: 0
-Url: https://gitorious.org/opensuse/zypp-plugin
Summary: Helper that makes writing ZYpp plugins easier
License: GPL-2.0
Group: System/Packages
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: https://github.com/openSUSE/zypp-plugin
Source0: %{name}-%{version}.tar.bz2
-%if 0%{?suse_version} >= 1210
BuildArch: noarch
+
+%if %{singlespec_py3}
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+BuildRequires: %{python_module devel}
+BuildRequires: python-rpm-macros
+Requires: python-base
+# provide old names for py2 package
+%if "%{python_flavor}" == "python2"
+Obsoletes: zypp-plugin-python < %{version}-%{release}
+Provides: zypp-plugin-python = %{version}-%{release}
+%endif
+%python_subpackages
+### ----------------------------------------
+### SLE-12* and even older
+%else
+%define have_python2 1
+%define have_python3 0
%endif
+### ----------------------------------------
%description
-Empty main package. Helper for different languages reside in subpackages.
+This API allows writing ZYpp plugins by just subclassing from a python class
+and implementing the commands you want to respond to as python methods.
%prep
%setup -q -n zypp-plugin
%build
+:
%install
-%{__mkdir_p} %{buildroot}%{python_sitelib}
-%{__install} python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
+%if 0%{?have_python2}
+mkdir -p %{buildroot}%{python_sitelib}
+install python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
%py_compile -O %{buildroot}/%{python_sitelib}
-%if 0%{?build_py3}
-%{__mkdir_p} %{buildroot}%{python3_sitelib}
-%{__install} python/zypp_plugin.py
%{buildroot}%{python3_sitelib}/zypp_plugin.py
+%endif
+%if 0%{?have_python3}
+mkdir -p %{buildroot}%{python3_sitelib}
+install python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
%py3_compile -O %{buildroot}/%{python3_sitelib}
%endif
-%if 0%{?build_py3}
-%package -n python3-%{name}
-Summary: Helper that makes writing ZYpp plugins in python easier
-Group: System/Packages
-Requires: python3
-BuildRequires: python3-devel
-
-%description -n python3-%{name}
-This API allows writing ZYpp plugins by just subclassing from a python class
-and implementing the commands you want to respond to as python methods.
-%endif
+%if %{singlespec_py3}
+%files %{python_files}
+%doc COPYING
+%{python_sitelib}/*
-%package python
+### ----------------------------------------
+### SLE-12* and even older
+%else
+%package -n %{name}-python
Summary: Helper that makes writing ZYpp plugins in python easier
Group: System/Packages
-Provides: python2-%{name}
+Provides: python2-%{name} = %{version}-%{release}
BuildRequires: python-devel
Requires: python
-%description python
-This API allows writing ZYpp plugins by just subclassing from a python class
-and implementing the commands you want to respond to as python methods.
-
-%files python
+%files -n %{name}-python
%defattr(-,root,root)
%doc COPYING
%{python_sitelib}/*
-%if 0%{?build_py3}
-%files -n python3-%{name}
-%defattr(-,root,root)
-%doc COPYING
-%{python3_sitelib}/*
+%description -n %{name}-python
+This API allows writing ZYpp plugins by just subclassing from a python class
+and implementing the commands you want to respond to as python methods.
+
%endif
+### ----------------------------------------
%changelog
