From 20b41fa78610b6a3ce83ebea53802b42f36964ca Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Thu, 13 Oct 2022 08:48:47 +0000 Subject: [PATCH] Accepting request 1007205 from home:michals - Fix M2Crypto package name on SLE12 - Do not build with python3.6 - it does not have libraries nothing provides python36-M2Crypto > 0.19 nothing provides python36-chardet OBS-URL: https://build.opensuse.org/request/show/1007205 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=374 --- osc.changes | 8 ++++++++ osc.spec | 26 ++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/osc.changes b/osc.changes index 0e2986c..1bb1489 100644 --- a/osc.changes +++ b/osc.changes @@ -11,6 +11,14 @@ Thu Sep 8 11:53:22 UTC 2022 - Daniel Mach - Revert to python2 on SLE12 - Recommend openssh for ssh key auth +------------------------------------------------------------------- +Wed Aug 17 10:55:30 UTC 2022 - Michal Suchanek + +- Fix M2Crypto package name on SLE12 +- Do not build with python3.6 - it does not have libraries + nothing provides python36-M2Crypto > 0.19 + nothing provides python36-chardet + ------------------------------------------------------------------- Thu Aug 11 11:38:19 UTC 2022 - Daniel Mach diff --git a/osc.spec b/osc.spec index 5702d2a..423cd62 100644 --- a/osc.spec +++ b/osc.spec @@ -25,16 +25,10 @@ %if %{with python3} %define use_python python3 -%define use_pythonpkg python3 -%if 0%{?suse_version} && 0%{?suse_version} < 1500 -%define use_python python3.6 -%define use_pythonpkg python36 -%endif # else if with python3 %else %define use_python python -%define use_pythonpkg python %endif %define version_unconverted 0.182.0 @@ -56,16 +50,16 @@ Source1: debian.dirs Source2: debian.docs Source3: debian.osc.links BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{use_pythonpkg}-devel -BuildRequires: %{use_pythonpkg}-setuptools +BuildRequires: %{use_python}-devel +BuildRequires: %{use_python}-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_pythonpkg}-rpm -Requires: %{use_pythonpkg}-rpm +BuildRequires: %{use_python}-rpm +Requires: %{use_python}-rpm %else BuildRequires: rpm-python Requires: rpm-python @@ -74,12 +68,12 @@ Requires: rpm-python %if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120 BuildArch: noarch %endif -%if 0%{?suse_version} Recommends: openssh -Requires: %{use_pythonpkg} -Recommends: %{use_pythonpkg}-progressbar -BuildRequires: %{use_pythonpkg}-xml -Requires: %{use_pythonpkg}-xml +%if 0%{?suse_version} +Requires: %{use_python} +Recommends: %{use_python}-progressbar +BuildRequires: %{use_python}-xml +Requires: %{use_python}-xml %if !%{with python3} && 0%{?suse_version} < 1020 BuildRequires: python-elementtree Requires: python-elementtree @@ -120,7 +114,7 @@ BuildRequires: python-elementtree Requires: python-elementtree %endif %if 0%{?suse_version} || 0%{?mandriva_version} || 0%{?mageia} -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} >= 1315 BuildRequires: %{use_python}-M2Crypto > 0.19 BuildRequires: %{use_python}-chardet Requires: %{use_python}-M2Crypto > 0.19