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

Accepting request 1007205 from home:michals

Browse Source 
- 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
This commit is contained in:
Daniel Mach 2022-10-13 08:48:47 +00:00 committed by Git OBS Bridge
parent c84e44d0a2
commit 20b41fa786
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc.changes
View File

@ -11,6 +11,14 @@ Thu Sep 8 11:53:22 UTC 2022 - Daniel Mach <daniel.mach@suse.com>
- Revert to python2 on SLE12 - Revert to python2 on SLE12
- Recommend openssh for ssh key auth - Recommend openssh for ssh key auth
-------------------------------------------------------------------
Wed Aug 17 10:55:30 UTC 2022 - Michal Suchanek <msuchanek@suse.com>
- 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 <daniel.mach@suse.com> Thu Aug 11 11:38:19 UTC 2022 - Daniel Mach <daniel.mach@suse.com>

26
osc.spec
View File

@ -25,16 +25,10 @@
%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 if with python3
%else %else
%define use_python python %define use_python python
%define use_pythonpkg python
%endif %endif
%define version_unconverted 0.182.0 %define version_unconverted 0.182.0
@ -56,16 +50,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_pythonpkg}-devel BuildRequires: %{use_python}-devel
BuildRequires: %{use_pythonpkg}-setuptools BuildRequires: %{use_python}-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_pythonpkg}-rpm BuildRequires: %{use_python}-rpm
Requires: %{use_pythonpkg}-rpm Requires: %{use_python}-rpm
%else %else
BuildRequires: rpm-python BuildRequires: rpm-python
Requires: rpm-python Requires: rpm-python
@ -74,12 +68,12 @@ Requires: rpm-python
%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120 %if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%if 0%{?suse_version}
Recommends: openssh Recommends: openssh
Requires: %{use_pythonpkg} %if 0%{?suse_version}
Recommends: %{use_pythonpkg}-progressbar Requires: %{use_python}
BuildRequires: %{use_pythonpkg}-xml Recommends: %{use_python}-progressbar
Requires: %{use_pythonpkg}-xml BuildRequires: %{use_python}-xml
Requires: %{use_python}-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
@ -120,7 +114,7 @@ BuildRequires: python-elementtree
Requires: python-elementtree Requires: python-elementtree
%endif %endif
%if 0%{?suse_version} || 0%{?mandriva_version} || 0%{?mageia} %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}-M2Crypto > 0.19
BuildRequires: %{use_python}-chardet BuildRequires: %{use_python}-chardet
Requires: %{use_python}-M2Crypto > 0.19 Requires: %{use_python}-M2Crypto > 0.19