From e749852b082594cb377fe6d004d30b0f632ca165 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Mon, 8 Aug 2022 14:06:17 +0000 Subject: [PATCH] Accepting request 992721 from home:dirkmueller:Factory - build against python3.6 for SLE12 and older OBS-URL: https://build.opensuse.org/request/show/992721 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=368 --- osc.changes | 5 +++++ osc.spec | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/osc.changes b/osc.changes index 534c9ec..149df1c 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 4 08:31:49 UTC 2022 - Dirk Müller + +- build against python3.6 for SLE12 and older + ------------------------------------------------------------------- Tue Jul 26 19:37:46 UTC 2022 - Daniel Mach diff --git a/osc.spec b/osc.spec index 13f8818..a104ba6 100644 --- a/osc.spec +++ b/osc.spec @@ -16,13 +16,19 @@ # -%if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 7 || 0%{?mageia} >= 8 +%if 0%{?suse_version} >= 1315 || 0%{?fedora} >= 29 || 0%{?rhel} >= 7 || 0%{?mageia} >= 8 %bcond_without python3 %else %bcond_with python3 %endif %if %{with python3} +%if 0%{?suse_version} >= 1500 %define use_python python3 +%define use_pythonpkg python3 +%else +%define use_python python3.6 +%define use_pythonpkg python36 +%endif %else %define use_python python %endif @@ -46,16 +52,16 @@ Source1: debian.dirs Source2: debian.docs Source3: debian.osc.links BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{use_python}-devel -BuildRequires: %{use_python}-setuptools +BuildRequires: %{use_pythonpkg}-devel +BuildRequires: %{use_pythonpkg}-setuptools BuildRequires: diffstat %if 0%{?mandriva_version} || 0%{?mageia} BuildRequires: python-rpm Requires: python-rpm %else %if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 32 || 0%{?rhel} >= 7 -BuildRequires: %{use_python}-rpm -Requires: %{use_python}-rpm +BuildRequires: %{use_pythonpkg}-rpm +Requires: %{use_pythonpkg}-rpm %else BuildRequires: rpm-python Requires: rpm-python @@ -65,10 +71,10 @@ Requires: rpm-python BuildArch: noarch %endif %if 0%{?suse_version} -Requires: %{use_python} -Recommends: %{use_python}-progressbar -BuildRequires: %{use_python}-xml -Requires: %{use_python}-xml +Requires: %{use_pythonpkg} +Recommends: %{use_pythonpkg}-progressbar +BuildRequires: %{use_pythonpkg}-xml +Requires: %{use_pythonpkg}-xml %if !%{with python3} && 0%{?suse_version} < 1020 BuildRequires: python-elementtree Requires: python-elementtree