diff --git a/python-packaging.changes b/python-packaging.changes index ca56d5a..09e5ac9 100644 --- a/python-packaging.changes +++ b/python-packaging.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 9 16:39:58 UTC 2023 - Dirk Müller + +- Don't use :primary multibuild flavor for non-Tumbleweed + * accomodates special SLE15 projects defininig extra flavors but + not building for primary python3 + ------------------------------------------------------------------- Fri Jan 13 15:27:09 UTC 2023 - Ben Greiner diff --git a/python-packaging.spec b/python-packaging.spec index 46ce291..ea0f3e7 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -20,6 +20,7 @@ # in order to avoid rewriting for subpackage generator %define mypython python %global flavor @BUILD_FLAVOR@%{nil} +%if 0%{?suse_version} >= 1550 %if "%{flavor}" == "primary" # this one is goes into Ring0: Bootstrap for primary python stack %define pprefix %{primary_python} @@ -33,6 +34,15 @@ %{expand:%%define skip_%{primary_python} 1} BuildRequires: python3-packaging %endif +%else +# backport and option d projects for 15.X having one or more python in the buildset don't need the Ring split for bootstrap +%if "%{flavor}" == "primary" +%define python_module() invalid-multibuild-flavor-for-15.X +ExclusiveArch: do-not-build +%else +%define pprefix python +%endif +%endif %if "%{flavor}" == "test" %define pprefix python %define psuffix -test