From 9e9b65bdfef91c82d7292268b2427837dc0a626b2393174abde2d4d9d2141f97 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 4 Jan 2021 07:37:18 +0000 Subject: [PATCH] Accepting request 859972 from home:bnavigator:branches:Application:Geo - Skip Python2 build. It is not supported by upstream anymore and the unit tests in Leap fail because of it - Let the %python_subpackages macro take care of the correct provides/obsoletes flavors. (gh#openSUSE/python-rpm-macros#66) Why do you have Tumbleweed disabled in the repolist for this package? OBS-URL: https://build.opensuse.org/request/show/859972 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-Shapely?expand=0&rev=19 --- python-Shapely.changes | 8 ++++++++ python-Shapely.spec | 18 ++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/python-Shapely.changes b/python-Shapely.changes index 967a1cc..3ffcdc8 100644 --- a/python-Shapely.changes +++ b/python-Shapely.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 3 18:57:57 UTC 2021 - Benjamin Greiner + +- Skip Python2 build. It is not supported by upstream anymore and + the unit tests in Leap fail because of it +- Let the %python_subpackages macro take care of the correct + provides/obsoletes flavors. (gh#openSUSE/python-rpm-macros#66) + ------------------------------------------------------------------- Sun Sep 27 16:35:53 UTC 2020 - Hans-Peter Jansen diff --git a/python-Shapely.spec b/python-Shapely.spec index 898aad4..2e6a376 100644 --- a/python-Shapely.spec +++ b/python-Shapely.spec @@ -19,6 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python %bcond_without test +%define skip_python2 1 Name: python-Shapely Version: 1.7.1 Release: 0 @@ -34,21 +35,15 @@ BuildRequires: fdupes BuildRequires: geos-devel >= 3.3 BuildRequires: python-rpm-macros Requires: geos >= 3.3 +Recommends: python-numpy # SECTION test requirements -BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest} %if 0%{?suse_version} > 1320 BuildRequires: %{python_module matplotlib} %endif # /SECTION -%ifpython2 -Obsoletes: %{oldpython}-shapely < %{version} -Provides: %{oldpython}-shapely = %{version} -%endif -%ifpython3 -Obsoletes: python3-shapely < %{version} -Provides: python3-shapely = %{version} -%endif +Provides: python-shapely = %{version} +Obsoletes: python-shapely < %{version} %python_subpackages %description @@ -76,13 +71,12 @@ rm -fv %{buildroot}%{_prefix}/shapely/_geos.pxi rm -frv %{buildroot}%{_prefix}/shapely %check -mv shapely shapely_temp %pytest_arch -mv shapely_temp shapely %files %{python_files} %license LICENSE.txt %doc CREDITS.txt README.rst docs/* -%{python_sitearch}/* +%{python_sitearch}/shapely +%{python_sitearch}/Shapely-%{version}*-info %changelog