- Remove hardcoded primary_python variable.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=81
This commit is contained in:
parent
5a8545c033
commit
adf51d2a91
@ -3,6 +3,7 @@ Fri Jul 15 12:23:12 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
|||||||
|
|
||||||
- Split primary flavor in multibuild for possible inclusion into
|
- Split primary flavor in multibuild for possible inclusion into
|
||||||
Ring0
|
Ring0
|
||||||
|
- Remove hardcoded primary_python variable.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 14 14:39:02 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
Thu Jul 14 14:39:02 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||||
|
@ -20,12 +20,6 @@
|
|||||||
# in order to avoid rewriting for subpackage generator
|
# in order to avoid rewriting for subpackage generator
|
||||||
%define mypython python
|
%define mypython python
|
||||||
|
|
||||||
# this must be hardcoded until obs can read it from a prjconf definition
|
|
||||||
%if 0%{suse_version} >= 1550
|
|
||||||
%define primary_python python310
|
|
||||||
%else
|
|
||||||
%define primary_python python3
|
|
||||||
%endif
|
|
||||||
%global flavor @BUILD_FLAVOR@%{nil}
|
%global flavor @BUILD_FLAVOR@%{nil}
|
||||||
%if "%{flavor}" == "primary"
|
%if "%{flavor}" == "primary"
|
||||||
# this one is built in Ring0
|
# this one is built in Ring0
|
||||||
@ -73,8 +67,8 @@ BuildRequires: %{python_module railroad-diagrams}
|
|||||||
#!BuildIgnore: python3-packaging
|
#!BuildIgnore: python3-packaging
|
||||||
Provides: %{mypython}%{python_version}dist(%{modname}) = %{version}
|
Provides: %{mypython}%{python_version}dist(%{modname}) = %{version}
|
||||||
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
|
%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
|
||||||
Provides: %{mypython}3dist(%{modname}) = %{version}
|
|
||||||
Provides: %{mypython}3-%{modname} = %{version}-%{release}
|
Provides: %{mypython}3-%{modname} = %{version}-%{release}
|
||||||
|
Provides: %{mypython}3dist(%{modname}) = %{version}
|
||||||
Obsoletes: %{mypython}3-%{modname} < %{version}-%{release}
|
Obsoletes: %{mypython}3-%{modname} < %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
# /SECTION
|
# /SECTION
|
||||||
|
Loading…
Reference in New Issue
Block a user