From 491239a3a1f6c0dd3fce4813517df188b227250b3b4f74ab8a9466d4369b7217 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 2 Aug 2022 15:36:53 +0000 Subject: [PATCH] Run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=82 --- python-pyparsing.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 63e93af..295d438 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -19,7 +19,6 @@ %define modname pyparsing # in order to avoid rewriting for subpackage generator %define mypython python - %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "primary" # this one is built in Ring0 @@ -29,13 +28,13 @@ %if "%{flavor}" == "" # The rest is in Ring1 %define pprefix python -%if 0%{suse_version} >= 1550 || 0%{?sle_version} == 150500 -%{expand:%%define skip_%{primary_python} 1} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} == 150500 BuildRequires: python3-base >= 3.6 +%{expand:%%define skip_%{primary_python} 1} %else +%define python_module() no-build-without-multibuild-flavor # no non-primary python in <=15.4 ExclusiveArch: do-not-build -%define python_module() no-build-without-multibuild-flavor %endif %endif %if "%{flavor}" == "test" @@ -45,7 +44,6 @@ ExclusiveArch: do-not-build %else %bcond_with test %endif - %{?!python_module:%define python_module() python3-%{**}} Name: %{pprefix}-pyparsing%{?psuffix} Version: 3.0.9 @@ -58,6 +56,7 @@ BuildRequires: %{python_module base} BuildRequires: %{python_module flit-core} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildArch: noarch %if %{with test} BuildRequires: %{python_module jinja2} BuildRequires: %{python_module pytest} @@ -72,7 +71,6 @@ Provides: %{mypython}3dist(%{modname}) = %{version} Obsoletes: %{mypython}3-%{modname} < %{version}-%{release} %endif # /SECTION -BuildArch: noarch %python_subpackages %description