From b1e92fb56fcb1ca113398df95b43a1347e0758a2a52cf82af6e31cc8812c7916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Sep 2019 09:18:31 +0000 Subject: [PATCH] Accepting request 731210 from home:jayvdb:py3only Allow building only python and fix Leap/SLE 15 OBS-URL: https://build.opensuse.org/request/show/731210 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=177 --- python-setuptools.changes | 7 +++++++ python-setuptools.spec | 3 +++ 2 files changed, 10 insertions(+) diff --git a/python-setuptools.changes b/python-setuptools.changes index 54458ab..9d752f5 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 14 02:08:41 UTC 2019 - John Vandenberg + +- Define LANG in %check to fix openSUSE/SLE 15 testsuite +- Only require python-futures for building if building flavour + python2 + ------------------------------------------------------------------- Wed Aug 21 12:40:01 UTC 2019 - Tomáš Chvátal diff --git a/python-setuptools.spec b/python-setuptools.spec index a690b51..01ff341 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -63,7 +63,9 @@ BuildRequires: %{python_module pytest-virtualenv} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools >= %{version}} BuildRequires: %{python_module wheel} +%if 0%{?have_python2} && ! 0%{?skip_python2} BuildRequires: python-futures +%endif %else #!BuildIgnore: python-pyparsing #!BuildIgnore: python2-pyparsing @@ -110,6 +112,7 @@ sed -r -i '1s@^#!/.*$@@' setuptools/command/easy_install.py %check %if %{with test} +export LANG=en_US.UTF-8 %pytest %endif