From 06b5b15da3fdede3ffa92872b32536d197c6bfaab86372cebc8460434c9dfe91 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sun, 26 Feb 2023 11:23:47 +0000
Subject: [PATCH] Accepting request 1067784 from
 home:mcepl:branches:devel:languages:python:numeric

- Split package into multibuild to avoid a build cycle
  (bsc#1207791).

OBS-URL: https://build.opensuse.org/request/show/1067784
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-geopandas?expand=0&rev=3
---
 _multibuild              |  3 ++
 python-geopandas.changes |  6 +++
 python-geopandas.spec    | 79 ++++++++++++++++++++++++----------------
 3 files changed, 56 insertions(+), 32 deletions(-)
 create mode 100644 _multibuild

diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/python-geopandas.changes b/python-geopandas.changes
index b0cc428..34f6917 100644
--- a/python-geopandas.changes
+++ b/python-geopandas.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Feb 25 22:30:51 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Split package into multibuild to avoid a build cycle
+  (bsc#1207791).
+
 -------------------------------------------------------------------
 Fri Sep 16 01:58:53 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-geopandas.spec b/python-geopandas.spec
index 4157043..ea7fd2c 100644
--- a/python-geopandas.spec
+++ b/python-geopandas.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-geopandas
+# spec file
 #
-# Copyright (c) 2022 SUSE LLC.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,40 +12,30 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define         skip_python2 1
-Name:           python-geopandas
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name:           python-geopandas%{psuffix}
 Version:        0.11.1
 Release:        0
-License:        BSD-3-Clause
 Summary:        Geographic pandas extensions
-Url:            http://geopandas.org
+License:        BSD-3-Clause
 Group:          Development/Languages/Python
+URL:            https://geopandas.org
 Source:         https://files.pythonhosted.org/packages/source/g/geopandas/geopandas-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
-BuildRequires:  %{python_module setuptools}
-# SECTION test requirements
-BuildRequires:  %{python_module Fiona}
-BuildRequires:  %{python_module folium}
-# mapclassify not yet available
-#BuildRequires: %%{python_module mapclassify}
-BuildRequires:  %{python_module pandas >= 0.23.0}
-BuildRequires:  %{python_module pygeos}
-BuildRequires:  %{python_module pyproj}
-BuildRequires:  %{python_module shapely}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module geopy}
-BuildRequires:  %{python_module Rtree}
-BuildRequires:  %{python_module matplotlib}
-BuildRequires:  %{python_module scipy}
-BuildRequires:  libgdal-devel
-BuildRequires:  proj
-BuildRequires:  proj-devel
-# /SECTION
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 Requires:       python-Fiona
 Requires:       python-pandas >= 0.23.0
 Requires:       python-pyproj
@@ -53,7 +43,24 @@ Requires:       python-shapely
 Recommends:     python-geopy
 Recommends:     python-matplotlib
 BuildArch:      noarch
-
+%if %{with test}
+BuildRequires:  %{python_module Fiona}
+BuildRequires:  %{python_module Rtree}
+BuildRequires:  %{python_module folium}
+BuildRequires:  %{python_module geopy}
+BuildRequires:  %{python_module matplotlib}
+# mapclassify not yet available
+#BuildRequires: %%{python_module mapclassify}
+BuildRequires:  %{python_module pandas >= 0.23.0}
+BuildRequires:  %{python_module pygeos}
+BuildRequires:  %{python_module pyproj}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module scipy}
+BuildRequires:  %{python_module shapely}
+BuildRequires:  libgdal-devel
+BuildRequires:  proj
+BuildRequires:  proj-devel
+%endif
 %python_subpackages
 
 %description
@@ -63,21 +70,29 @@ GeoPandas enables you to easily do operations in python that would otherwise
 require a spatial database such as PostGIS.
 
 %prep
-%setup -q -n geopandas-%{version}
+%autosetup -p1 -n geopandas-%{version}
 
 %build
-%python_build
+%if ! %{with wheel}
+%pyproject_wheel
+%endif
 
 %install
-%python_install
+%if !%{with test}
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
+%if %{with test}
 %pytest -rs -k 'not test_overlay'
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %doc README.md
 %license LICENSE.txt
 %{python_sitelib}/geopandas*/
+%endif
 
 %changelog