dmach/osc-fork
1
0
Fork 0
forked from pool/osc
Code Pull Requests Activity

Accepting request 992721 from home:dirkmueller:Factory

Browse Source 
- 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
This commit is contained in:
Daniel Mach 2022-08-08 14:06:17 +00:00 committed by Git OBS Bridge
parent e61248cafb
commit e749852b08
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 4 08:31:49 UTC 2022 - Dirk Müller <dmueller@suse.com>
- build against python3.6 for SLE12 and older
-------------------------------------------------------------------
Tue Jul 26 19:37:46 UTC 2022 - Daniel Mach <daniel.mach@suse.com>

24
osc.spec
View File

@ -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