Accepting request 784647 from devel:languages:python

- Fix build without python2

OBS-URL: https://build.opensuse.org/request/show/784647
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-setuptools?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2020-03-26 23:23:03 +00:00 committed by Git OBS Bridge
commit 6b1826deef
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 13 13:09:15 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Fix build without python2
-------------------------------------------------------------------
Tue Feb 4 14:29:34 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>

View File

@ -26,6 +26,7 @@
%define psuffix %{nil}
%bcond_with test
%endif
%bcond_without python2
Name: python-setuptools%{psuffix}
Version: 44.0.0
Release: 0
@ -47,10 +48,6 @@ BuildRequires: %{python_module xml}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: unzip
# The dependency download feature may require SSL, which is in python3-base and python(2)
%ifpython2
Requires: python
%endif
Requires: python-appdirs
Requires: python-base
Requires: python-ordered-set
@ -60,6 +57,10 @@ Requires: python-xml
Requires(post): update-alternatives
Requires(postun): update-alternatives
BuildArch: noarch
# The dependency download feature may require SSL, which is in python3-base and python(2)
%ifpython2
Requires: python
%endif
%if %{with test}
BuildRequires: %{python_module Paver}
BuildRequires: %{python_module devel}
@ -70,8 +71,10 @@ BuildRequires: %{python_module pytest-virtualenv}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools >= %{version}}
BuildRequires: %{python_module wheel}
%if %{with python2}
BuildRequires: python-futures
%endif
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 24
Recommends: ca-certificates-mozilla
%endif