diff --git a/osc.changes b/osc.changes index e8519fb..de91e48 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 11 11:38:19 UTC 2022 - Daniel Mach + +- fix building on distros that are not openSUSE or SLE + +------------------------------------------------------------------- +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 bb5be1e..ba78d69 100644 --- a/osc.spec +++ b/osc.spec @@ -16,15 +16,25 @@ # -%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} + %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.181.0 @@ -46,16 +56,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 +75,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