diff --git a/_multibuild b/_multibuild index de84037..a5e4a0f 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,5 @@ + python3 python36 python38 python39 diff --git a/python-wxPython.changes b/python-wxPython.changes index 7cc5902..0ede1ba 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 4 13:58:38 UTC 2022 - Ben Greiner + +- Appease factory-auto bot about package src name + ------------------------------------------------------------------- Tue Jan 4 10:18:08 UTC 2022 - Matej Cepl diff --git a/python-wxPython.spec b/python-wxPython.spec index 854ff27..9fc79e0 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -26,6 +26,8 @@ %endif %global flavor @BUILD_FLAVOR@%{nil} +%define pprefix python +%define psuffix %{nil} %if 0%{suse_version} >= 1550 # Tumbleweed has a varying number of python3 flavors. Ideally, the flavor # selection here and in _multibuild is in sync with the Factory prjconf @@ -51,16 +53,16 @@ %define psuffix -other %endif # The obs server-side interpreter cannot use lua or rpm shrink -%if "%pythons" == "" || "%pythons" == " " || "%pythons" == " " || "%pythons" == " " +%if "%pythons" == "" || "%pythons" == " " || "%pythons" == " " || "%pythons" == " " || "%flavor" == "python3" ExclusiveArch: donotbuild +%define python_module() all-python-flavors-skipped-in-flavorless-multibuild %endif %else -# The SLE/Leap python3 package is built without subpackage rewriting in the main flavor -%if "%flavor" == "" +# The SLE/Leap python3 package is built without subpackage rewriting in its own flavor +%if "%flavor" == "python3" %define pprefix python3 -%define psuffix %{nil} %define pythons python3 -%define python_files() -n %{pprefix}-%{**} +%define python_files() -n python3-%{**} %define python_module() python3-%{**} %define python_version %python3_version %define python_sitearch %python3_sitearch