From 2dc6c28f3bc88a2f537418836dfa6c1a62575716a4edf25962c198ce1be89327 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 25 Mar 2021 21:29:24 +0000 Subject: [PATCH] Accepting request 881357 from home:bnavigator:branches:Java:packages - Can't assume non-existence of python38 macros in Leap. gh#openSUSE/python-rpm-macros#107 Test for suse_version instead. Only Tumbleweed has and needs the python_subpackage_only support. OBS-URL: https://build.opensuse.org/request/show/881357 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=86 --- javapackages-tools.changes | 8 ++++++++ javapackages-tools.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 6a7393e..6bfd391 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner + +- Can't assume non-existence of python38 macros in Leap. + gh#openSUSE/python-rpm-macros#107 + Test for suse_version instead. Only Tumbleweed has and needs the + python_subpackage_only support. + ------------------------------------------------------------------- Sat Nov 28 09:37:25 UTC 2020 - Benjamin Greiner diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 819c6f3..76e3a50 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -66,8 +66,8 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: python-rpm-macros BuildArch: noarch -%if 0%{?python38_version_nodots} -# if python multiflavor is in place yet, use it to generate subpackages +%if 0%{?suse_version} >= 1550 +# TW: generate subpackages for every python3 flavor %define python_subpackage_only 1 %python_subpackages %else