pool/python-setuptools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix build without python2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=192
This commit is contained in:
Tomáš Chvátal 2020-03-13 13:17:24 +00:00 committed by Git OBS Bridge
parent aa9e8b0acb
commit 0ab740a1c9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-setuptools.changes
View File

@ -1,8 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 10 08:04:09 UTC 2020 - Dirk Mueller <dmueller@suse.com> Fri Mar 13 13:09:15 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- remove dependency on six, this is vendored in setuptools to break - Fix build without python2
the buildcycle with six (bsc#1166139)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 4 14:29:34 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com> Tue Feb 4 14:29:34 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>

13
python-setuptools.spec
View File

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