From 29c780061ce8898faa24370f4b70e3f9ff33a84f Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 20 2022 18:40:19 +0000
Subject: Version 1.3.3


---

diff --git a/.gitignore b/.gitignore
index 0041769..603b88c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ basemap-0.99.4-examples.tar.gz
 /basemap-1.2.1.tar.gz
 /basemap-1.2.2.tar.gz
 /basemap-1.3.0.tar.gz
+/basemap-1.3.3.tar.gz
diff --git a/python-basemap.spec b/python-basemap.spec
index 8ac5d32..0e42ea2 100644
--- a/python-basemap.spec
+++ b/python-basemap.spec
@@ -1,13 +1,12 @@
 %global debug_package %{nil}
 
 Name:           python-basemap
-Version:        1.3.0
-Release:        4%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 License:        LGPLv2+
 URL:            https://matplotlib.org/basemap/
 Source0:        https://github.com/matplotlib/basemap/archive/v%{version}/basemap-%{version}.tar.gz
-Patch0:         verpins.patch
 
 BuildRequires:  gcc
 
@@ -46,39 +45,58 @@ projections (with continental and political boundaries).
 
 %prep
 %autosetup -n basemap-%{version} -p0
-# Remove the bundled libraries
-rm -rf geos-3.3.3/
 
 %build
 # regenerate Cython generated files
-%{__python3} -m cython src/*.pyx
+%python3 -m cython packages/basemap/src/*.pyx
 export GEOS_LIB="/usr/"
-%{__python3} setup.py config
-%py3_build
 
+pushd packages/basemap
+%python3 setup.py config
+%py3_build
 chrpath --delete build/lib*/*.so
+popd
+
+pushd packages/basemap_data
+%py3_build
+popd
 
 %install
+pushd packages/basemap
 %py3_install
+popd
+
+pushd packages/basemap_data
+%py3_install
+popd
+
 
 %check
-PYTHONPATH=%{buildroot}%{python3_sitearch} \
-    %{__python3} -c 'from mpl_toolkits.basemap import Basemap'
+PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib} \
+    %python3 -c 'from mpl_toolkits.basemap import Basemap'
 
 %files -n python-basemap-examples
 %doc examples/*
 
 %files -n python3-basemap
-%license LICENSE_data LICENSE_epsg
-%doc README.md
+%license packages/basemap_data/LICENSE.*
+%doc packages/basemap_data/README.md
 %{python3_sitearch}/mpl_toolkits/basemap
-%{python3_sitearch}/mpl_toolkits/basemap_data
-%{python3_sitearch}/*.egg-info
+%{python3_sitearch}/basemap-%{version}-py%{python3_version}.egg-info
 %{python3_sitearch}/basemap-%{version}-py%{python3_version}-nspkg.pth
 %{python3_sitearch}/_geoslib.cpython-3*.so
+%{python3_sitelib}/mpl_toolkits/basemap_data
+# It seems that they forgot to bump the version in basemap_data
+%{python3_sitelib}/basemap_data-*-py%{python3_version}.egg-info
+%{python3_sitelib}/basemap_data-*-py%{python3_version}-nspkg.pth
 
 
 %changelog
+* Wed Jul 20 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.3-1
+- Update to latest version (#2044035). Seems to be just bugfixes, see
+  https://github.com/matplotlib/basemap/blob/develop/CHANGELOG.md#133---2022-05-11
+  for details.
+
 * Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.0-4
 - Rebuilt for pyparsing-3.0.9
 
diff --git a/sources b/sources
index d270e23..c9b0258 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (basemap-1.3.0.tar.gz) = e58a273b5ba1151917cd1ff85d2ca5e3fcf3c3ed3661b261290ae81a9c6b4f911851d3477a8b7691e21b37984e8e124b87f8afd457cba340e12b82d99add1a52
+SHA512 (basemap-1.3.3.tar.gz) = 99f853434444bb362387e35ebed77afbf63a3d1ed20e6330574a2f2ee2123490778be2a39f5b81f20644b1e1adf8a7b9f219914f46d9c8717bf44cb25c69907b
diff --git a/verpins.patch b/verpins.patch
deleted file mode 100644
index b72f409..0000000
--- a/verpins.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- requirements.txt~	2020-11-19 18:27:26.000000000 -0600
-+++ requirements.txt	2021-12-30 13:17:28.122358217 -0600
-@@ -12,7 +12,7 @@
- numpy >= 1.2.1, < 1.12.0; python_version == "3.2"
- numpy >= 1.2.1, < 1.12.0; python_version == "3.3"
- numpy >= 1.2.1, < 1.17.0; python_version == "3.4"
--numpy >= 1.2.1, < 1.20.0; python_version >= "3.5"
-+numpy >= 1.2.1, < 2; python_version >= "3.5"
- 
- pyparsing >= 1.5.0, < 2.4.1; python_version == "2.6"
- pyparsing >= 1.5.0, < 3.0.0; python_version == "2.7"
-@@ -24,7 +24,7 @@
- matplotlib >= 1.5.0, < 2.0.0; python_version == "3.2"
- matplotlib >= 1.5.0, < 2.0.0; python_version == "3.3"
- matplotlib >= 1.5.0, < 3.0.0; python_version == "3.4"
--matplotlib >= 1.5.0, < 3.4.0; python_version >= "3.5"
-+matplotlib >= 1.5.0, < 4; python_version >= "3.5"
- 
- pyproj >= 1.9.3, < 2.0.0; python_version == "2.6"
- pyproj >= 1.9.3, < 2.3.0; python_version == "2.7"