rpm/osc
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 994530 from openSUSE:Tools

Browse Source 
- fix building on distros that are not openSUSE or SLE
- build against python3.6 for SLE12 and older

OBS-URL: https://build.opensuse.org/request/show/994530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=165
This commit is contained in:
Dominique Leuenberger 2022-08-11 16:32:53 +00:00 committed by Git OBS Bridge
commit 444f38453d
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 11 11:38:19 UTC 2022 - Daniel Mach <daniel.mach@suse.com>
- fix building on distros that are not openSUSE or SLE
-------------------------------------------------------------------
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> Tue Jul 26 19:37:46 UTC 2022 - Daniel Mach <daniel.mach@suse.com>

28
osc.spec
View File

@ -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 %bcond_without python3
%else %else
%bcond_with python3 %bcond_with python3
%endif %endif
%if %{with python3} %if %{with python3}
%define use_python 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 %else
%define use_python python %define use_python python
%define use_pythonpkg python
%endif %endif
%define version_unconverted 0.181.0 %define version_unconverted 0.181.0
@ -46,16 +56,16 @@ Source1: debian.dirs
Source2: debian.docs Source2: debian.docs
Source3: debian.osc.links Source3: debian.osc.links
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{use_python}-devel BuildRequires: %{use_pythonpkg}-devel
BuildRequires: %{use_python}-setuptools BuildRequires: %{use_pythonpkg}-setuptools
BuildRequires: diffstat BuildRequires: diffstat
%if 0%{?mandriva_version} || 0%{?mageia} %if 0%{?mandriva_version} || 0%{?mageia}
BuildRequires: python-rpm BuildRequires: python-rpm
Requires: python-rpm Requires: python-rpm
%else %else
%if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 32 || 0%{?rhel} >= 7 %if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 32 || 0%{?rhel} >= 7
BuildRequires: %{use_python}-rpm BuildRequires: %{use_pythonpkg}-rpm
Requires: %{use_python}-rpm Requires: %{use_pythonpkg}-rpm
%else %else
BuildRequires: rpm-python BuildRequires: rpm-python
Requires: rpm-python Requires: rpm-python
@ -65,10 +75,10 @@ Requires: rpm-python
BuildArch: noarch BuildArch: noarch
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: %{use_python} Requires: %{use_pythonpkg}
Recommends: %{use_python}-progressbar Recommends: %{use_pythonpkg}-progressbar
BuildRequires: %{use_python}-xml BuildRequires: %{use_pythonpkg}-xml
Requires: %{use_python}-xml Requires: %{use_pythonpkg}-xml
%if !%{with python3} && 0%{?suse_version} < 1020 %if !%{with python3} && 0%{?suse_version} < 1020
BuildRequires: python-elementtree BuildRequires: python-elementtree
Requires: python-elementtree Requires: python-elementtree