From adf51d2a9115ab9b9af83f9144f70bc8e7aedab72822eafdf40729158f2ba60b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 2 Aug 2022 15:36:09 +0000 Subject: [PATCH] - Remove hardcoded primary_python variable. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=81 --- python-pyparsing.changes | 1 + python-pyparsing.spec | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index e3bd92a..314cfa2 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -3,6 +3,7 @@ Fri Jul 15 12:23:12 UTC 2022 - Ben Greiner - Split primary flavor in multibuild for possible inclusion into Ring0 +- Remove hardcoded primary_python variable. ------------------------------------------------------------------- Thu Jul 14 14:39:02 UTC 2022 - Ben Greiner diff --git a/python-pyparsing.spec b/python-pyparsing.spec index f5ec38d..63e93af 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -20,12 +20,6 @@ # in order to avoid rewriting for subpackage generator %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} %if "%{flavor}" == "primary" # this one is built in Ring0 @@ -73,8 +67,8 @@ BuildRequires: %{python_module railroad-diagrams} #!BuildIgnore: python3-packaging Provides: %{mypython}%{python_version}dist(%{modname}) = %{version} %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" -Provides: %{mypython}3dist(%{modname}) = %{version} Provides: %{mypython}3-%{modname} = %{version}-%{release} +Provides: %{mypython}3dist(%{modname}) = %{version} Obsoletes: %{mypython}3-%{modname} < %{version}-%{release} %endif # /SECTION