Hello community,
here is the log from the commit of package qpid-proton for openSUSE:Factory
checked in at 2020-12-03 18:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qpid-proton (Old)
and /work/SRC/openSUSE:Factory/.qpid-proton.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpid-proton"
Thu Dec 3 18:38:12 2020 rev:18 rq:851380 version:0.31.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qpid-proton/qpid-proton.changes 2020-11-15
15:22:36.451208447 +0100
+++ /work/SRC/openSUSE:Factory/.qpid-proton.new.5913/qpid-proton.changes
2020-12-03 18:38:18.725707892 +0100
@@ -1,0 +2,6 @@
+Sun Nov 22 20:09:57 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Fix the python multiflavor subpackage generation
+ gh#openSUSE/python-rpm-macros#79
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qpid-proton.spec ++++++
--- /var/tmp/diff_new_pack.FIY5Yd/_old 2020-12-03 18:38:19.417709203 +0100
+++ /var/tmp/diff_new_pack.FIY5Yd/_new 2020-12-03 18:38:19.421709211 +0100
@@ -51,11 +51,12 @@
BuildRequires: python-rpm-macros
BuildRequires: swig >= 2.0.9
%if 0%{?python38_version_nodots}
-# if python multiflavor is in place yet, use it to generate subpackages
+# if python multiflavor is in place, use it to generate subpackages
%define python_subpackage_only 1
%python_subpackages
%else
-%define python_files() -n %python_prefix-%{**}
+%define python_files() -n python3-%{**}
+%define python_sitearch %python3_sitearch
%endif
%description
@@ -124,8 +125,29 @@
This subpackage contains the documentation.
-# TODO: Remove the python2 shim as soon as the rpm-macros support
python_subpackage_only.
-%if 0%{?have_python2} && ! 0%{?python_subpackage_only}
+%if 0%{?python_subpackage_only}
+# NOTE: the name on pypi for the package is python-qpid-proton so the name
+# for the RPM package should be <flavor>-python-qpid-proton (python-$pypi_name)
+%package -n python-python-qpid-proton
+Summary: Python language bindings for the Qpid Proton messaging
framework
+Group: Development/Libraries/Python
+Requires: libqpid-proton%{qpid_proton_soversion} = %{version}-%{release}
+Requires: python = %{python_version}
+# These will automatically be rewritten for the python flavors
+# including additional python- for python2 and python3- for the primary
provider
+# flavor
+Provides: python-qpid-proton = %{version}
+Obsoletes: python-qpid-proton < %{version}
+
+%description -n python-python-qpid-proton
+Proton is a messaging library. It can be used in brokers, client
+libraries, routers, bridges and proxies. Proton is based on the AMQP
+1.0 messaging standard.
+
+%else
+# for distributions with no support for python_subpackage_only
+
+%if 0%{?have_python2}
%package -n python2-python-qpid-proton
Summary: Python language bindings for the Qpid Proton messaging
framework
Group: Development/Libraries/Python
@@ -142,25 +164,19 @@
1.0 messaging standard.
%endif
-%package -n %{python_flavor}-python-qpid-proton
+%package -n python3-python-qpid-proton
Summary: Python language bindings for the Qpid Proton messaging
framework
Group: Development/Libraries/Python
Requires: libqpid-proton%{qpid_proton_soversion} = %{version}-%{release}
Requires: python = %{python_version}
-# NOTE: the name on pypi for the package is python-qpid-proton so the name
-# for the RPM package should be <flavor>-python-qpid-proton
(pythonXY-$pypi_name)
-%if "%{python_flavor}" == "python2"
-Provides: %{oldpython}-qpid-proton = %{version}
-Obsoletes: %{oldpython}-qpid-proton < %{version}
-%else
Provides: python3-qpid-proton = %{version}
Obsoletes: python3-qpid-proton < %{version}
-%endif
-%description -n %{python_flavor}-python-qpid-proton
+%description -n python3-python-qpid-proton
Proton is a messaging library. It can be used in brokers, client
libraries, routers, bridges and proxies. Proton is based on the AMQP
1.0 messaging standard.
+%endif
%prep
%autosetup -p1
@@ -245,7 +261,7 @@
%{_docdir}/%{name}/api-c
%{_docdir}/%{name}/api-cpp
-# only for non-multiple-flavor. TODO: Remove as soon as python_subpackage_only
is supported
+# only for distributions with no support for python_subpackage_only
%if 0%{?have_python2} && ! 0%{?python_subpackage_only}
%files -n python2-python-qpid-proton
%{python2_sitearch}/*_cproton*.so
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
