From d3ac09efaa1096d65164baefb03328d091fcd226e18f55edcd170e2fa75afd8b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Oct 2021 10:03:11 +0000 Subject: [PATCH] Accepting request 927314 from home:yfjiang:branches:GNOME:STABLE:41 Change %python38_version_nodots to %suse_version which is compatible with Leap and SLE. See also: https://github.com/openSUSE/python-rpm-macros/issues/107 OBS-URL: https://build.opensuse.org/request/show/927314 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=192 --- avahi-glib2.changes | 8 ++++++++ avahi-glib2.spec | 5 +++-- avahi-mono.changes | 8 ++++++++ avahi-mono.spec | 5 +++-- avahi-qt5.changes | 8 ++++++++ avahi-qt5.spec | 5 +++-- avahi.changes | 8 ++++++++ avahi.spec | 5 +++-- 8 files changed, 44 insertions(+), 8 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index ffe912e..ff4b3c7 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang + +- Change %python38_version_nodots to %suse_version which is + compatible with Leap and SLE. See also: + + https://github.com/openSUSE/python-rpm-macros/issues/107 + ------------------------------------------------------------------- Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 45f7711..2e70185 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -144,8 +144,8 @@ Requires: libavahi-client%{avahi_client_sover} >= %{version} BuildRequires: %{python_module dbm} BuildRequires: %{python_module dbus-python} BuildRequires: python-rpm-macros -%if 0%{?python38_version_nodots} -# if python multiflavor is in place yet, use it to generate subpackages +%if 0%{?suse_version} >= 1550 +# TW: generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else @@ -414,6 +414,7 @@ DNS specifications for Zeroconf Computing. # This is the avahi-discover command, only provided for the primary python3 flavor + %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi-mono.changes b/avahi-mono.changes index a7108b2..0c09e67 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang + +- Change %python38_version_nodots to %suse_version which is + compatible with Leap and SLE. See also: + + https://github.com/openSUSE/python-rpm-macros/issues/107 + ------------------------------------------------------------------- Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec diff --git a/avahi-mono.spec b/avahi-mono.spec index f98b81e..cba1174 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -144,8 +144,8 @@ Requires: libavahi-client%{avahi_client_sover} >= %{version} BuildRequires: %{python_module dbm} BuildRequires: %{python_module dbus-python} BuildRequires: python-rpm-macros -%if 0%{?python38_version_nodots} -# if python multiflavor is in place yet, use it to generate subpackages +%if 0%{?suse_version} >= 1550 +# TW: generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else @@ -413,6 +413,7 @@ DNS specifications for Zeroconf Computing. # This is the avahi-discover command, only provided for the primary python3 flavor + %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi-qt5.changes b/avahi-qt5.changes index 7549db1..4bb166b 100644 --- a/avahi-qt5.changes +++ b/avahi-qt5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang + +- Change %python38_version_nodots to %suse_version which is + compatible with Leap and SLE. See also: + + https://github.com/openSUSE/python-rpm-macros/issues/107 + ------------------------------------------------------------------- Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec diff --git a/avahi-qt5.spec b/avahi-qt5.spec index a9bbc06..4a870c7 100644 --- a/avahi-qt5.spec +++ b/avahi-qt5.spec @@ -144,8 +144,8 @@ Requires: libavahi-client%{avahi_client_sover} >= %{version} BuildRequires: %{python_module dbm} BuildRequires: %{python_module dbus-python} BuildRequires: python-rpm-macros -%if 0%{?python38_version_nodots} -# if python multiflavor is in place yet, use it to generate subpackages +%if 0%{?suse_version} >= 1550 +# TW: generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else @@ -414,6 +414,7 @@ DNS specifications for Zeroconf Computing. # This is the avahi-discover command, only provided for the primary python3 flavor + %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi.changes b/avahi.changes index 3ccc8a8..6c99686 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang + +- Change %python38_version_nodots to %suse_version which is + compatible with Leap and SLE. See also: + + https://github.com/openSUSE/python-rpm-macros/issues/107 + ------------------------------------------------------------------- Tue Oct 19 07:32:49 UTC 2021 - Dominique Leuenberger diff --git a/avahi.spec b/avahi.spec index bb07294..f6db170 100644 --- a/avahi.spec +++ b/avahi.spec @@ -147,8 +147,8 @@ Requires: libavahi-client%{avahi_client_sover} >= %{version} BuildRequires: %{python_module dbm} BuildRequires: %{python_module dbus-python} BuildRequires: python-rpm-macros -%if 0%{?python38_version_nodots} -# if python multiflavor is in place yet, use it to generate subpackages +%if 0%{?suse_version} >= 1550 +# TW: generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else @@ -417,6 +417,7 @@ DNS specifications for Zeroconf Computing. # This is the avahi-discover command, only provided for the primary python3 flavor + %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python