14
0
forked from pool/python-pycurl

- Add make-leap15-compat.patch to pass tests on Leap 15.2

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=77
This commit is contained in:
2020-12-15 13:45:12 +00:00
committed by Git OBS Bridge
parent cc0209f14a
commit 83afa3fbbf
2 changed files with 7 additions and 9 deletions

View File

@@ -1,13 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl <mcepl@suse.com> Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Add make-py2-compat.patch to pass tests on Leap 15.2 - Add make-leap15-compat.patch to pass tests on Leap 15.2
-------------------------------------------------------------------
Tue Dec 15 11:53:41 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Upstream dropped python2 support. Python2 tests fail on Leap.
=> skip python2 build.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 14 14:15:29 UTC 2020 - Matej Cepl <mcepl@suse.com> Mon Dec 14 14:15:29 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@@ -16,8 +16,8 @@
# #
%define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test" %if "%{flavor}" == "test"
%define psuffix -test %define psuffix -test
@@ -43,7 +43,7 @@ Patch3: disable_randomly_failing_tests.patch
# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#pycurl/pycurl#655 mcepl@suse.com # PATCH-FEATURE-UPSTREAM remove_nose.patch gh#pycurl/pycurl#655 mcepl@suse.com
# remove dependency on nose # remove dependency on nose
Patch4: remove_nose.patch Patch4: remove_nose.patch
# PATCH-FIX-UPSTREAM make-py2-compat.patch bsc#[0-9]+ mcepl@suse.com # PATCH-FIX-OPENSUSE make-leap15-compat.patch mcepl@suse.com
# Make tests passing with Leap 15.2 # Make tests passing with Leap 15.2
Patch5: make-py2-compat.patch Patch5: make-py2-compat.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
@@ -58,6 +58,10 @@ BuildRequires: %{python_module bottle}
BuildRequires: %{python_module flaky} BuildRequires: %{python_module flaky}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
%endif %endif
%ifpython2
Provides: %{oldpython}-curl = %{version}
Obsoletes: %{oldpython}-curl < %{version}
%endif
%python_subpackages %python_subpackages
%description %description