From 0ab740a1c911fa614833707051996b510bf065c477d037429c07faae311f3ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Mar 2020 13:17:24 +0000 Subject: [PATCH] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=192 --- python-setuptools.changes | 5 ++--- python-setuptools.spec | 13 +++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index a5fd7e8..a374be8 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- -Tue Mar 10 08:04:09 UTC 2020 - Dirk Mueller +Fri Mar 13 13:09:15 UTC 2020 - Tomáš Chvátal -- remove dependency on six, this is vendored in setuptools to break - the buildcycle with six (bsc#1166139) +- Fix build without python2 ------------------------------------------------------------------- Tue Feb 4 14:29:34 UTC 2020 - Ondřej Súkup diff --git a/python-setuptools.spec b/python-setuptools.spec index debdba0..8f8f52f 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -26,6 +26,7 @@ %define psuffix %{nil} %bcond_with test %endif +%bcond_without python2 Name: python-setuptools%{psuffix} Version: 44.0.0 Release: 0 @@ -42,22 +43,24 @@ BuildRequires: %{python_module appdirs} BuildRequires: %{python_module ordered-set} BuildRequires: %{python_module packaging} BuildRequires: %{python_module pyparsing >= 2.0.2} +BuildRequires: %{python_module six} 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 Requires: python-packaging +Requires: python-six 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} @@ -68,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