From 83afa3fbbf447cf14098ec9e3229f5960d967da67fe90168bc96707d0c108b66 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 15 Dec 2020 13:45:12 +0000 Subject: [PATCH] - 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 --- python-pycurl.changes | 8 +------- python-pycurl.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index 27a248f..92c75d6 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,13 +1,7 @@ ------------------------------------------------------------------- Tue Dec 15 12:56:23 UTC 2020 - Matej Cepl -- Add make-py2-compat.patch to pass tests on Leap 15.2 - -------------------------------------------------------------------- -Tue Dec 15 11:53:41 UTC 2020 - Benjamin Greiner - -- Upstream dropped python2 support. Python2 tests fail on Leap. - => skip python2 build. +- Add make-leap15-compat.patch to pass tests on Leap 15.2 ------------------------------------------------------------------- Mon Dec 14 14:15:29 UTC 2020 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index 77c3838..4d1b7d2 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -16,8 +16,8 @@ # +%define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "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 # remove dependency on nose 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 Patch5: make-py2-compat.patch BuildRequires: %{python_module devel} @@ -58,6 +58,10 @@ BuildRequires: %{python_module bottle} BuildRequires: %{python_module flaky} BuildRequires: %{python_module pytest} %endif +%ifpython2 +Provides: %{oldpython}-curl = %{version} +Obsoletes: %{oldpython}-curl < %{version} +%endif %python_subpackages %description