Update to latest version

And also fix the internal version provides.

.gitignore

@@ -9,3 +9,4 @@
 /proj-7.2.1.tar.gz
 /Cartopy-0.19.0.tar.gz
 /Cartopy-0.20.0.tar.gz
+/Cartopy-0.20.1.tar.gz

0001-Increase-tolerance-for-new-FreeType.patch

@@ -1,7 +1,7 @@
-From d6030c9c4d79d31671f0c4cdac82564071ba41cc Mon Sep 17 00:00:00 2001
+From 315041aebb9d635d75349d020752b847a77396db Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Mon, 26 Feb 2018 02:42:50 -0500
-Subject: [PATCH 3/3] Increase tolerance for new FreeType.
+Subject: [PATCH] Increase tolerance for new FreeType.
 
 Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 ---

0002-Remove-use-of-distutils.patch

@@ -1,40 +0,0 @@
-From e4d5d99ff63832e82bfeb6102728dec35433cc11 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Tue, 21 Sep 2021 03:00:50 -0400
-Subject: [PATCH 2/3] Remove use of distutils
-
-Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
----
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index c0402944..6517b5e4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -26,11 +26,11 @@ Make sure you have pip >= 9.0.1.
- 
- import fnmatch
- import os
-+import shutil
- import subprocess
- import warnings
- from collections import defaultdict
--from distutils.spawn import find_executable
--from distutils.sysconfig import get_config_var
-+from sysconfig import get_config_var
- 
- from setuptools import Command, Extension, convert_path, setup
- 
-@@ -142,7 +142,7 @@ else:
- 
- # Proj
- def find_proj_version_by_program(conda=None):
--    proj = find_executable('proj')
-+    proj = shutil.which('proj')
-     if proj is None:
-         print(
-             'Proj {} must be installed.'.format(
--- 
-2.31.1
-

python-cartopy.spec

@@ -5,7 +5,7 @@
 %bcond_with network
 
 Name:           python-%{srcname}
-Version:        0.20.0
+Version:        0.20.1
 Release:        %autorelease
 Summary:        Cartographic Python library with Matplotlib visualisations
 
@@ -15,16 +15,12 @@ Source0:        %pypi_source %{Srcname}
 # Set location of Fedora-provided pre-existing data.
 Source1:        siteconfig.py
 
-# https://github.com/SciTools/cartopy/pull/1882
-Patch0001:      0001-Regenerate-all-tick-test-images.patch
-# https://github.com/SciTools/cartopy/pull/1883
-Patch0002:      0002-Remove-use-of-distutils.patch
 # Might not go upstream in current form.
-Patch0003:      0003-Increase-tolerance-for-new-FreeType.patch
+Patch0001:      0001-Increase-tolerance-for-new-FreeType.patch
 
 BuildRequires:  git-core
 BuildRequires:  gcc-c++
-BuildRequires:  geos-devel >= 3.3.3
+BuildRequires:  geos-devel >= 3.7.2
 BuildRequires:  proj-devel >= 8.0.0
 BuildRequires:  proj-data-uk
 BuildRequires:  python3-devel
@@ -89,7 +85,7 @@ rm lib/cartopy/trace.cpp
 
 
 %build
-export FORCE_CYTHON=1
+export FORCE_CYTHON=1 SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 %pyproject_wheel
 
 

sources

@@ -1 +1 @@
-SHA512 (Cartopy-0.20.0.tar.gz) = 2daab825fd53e5508e8a6bfa119f883e3647b4ebd76ae3cd38890f28c9bbab4e23259e2afa168e57b8ff05a758272dfbf27ba98cec102106759b0c1be3679e90
+SHA512 (Cartopy-0.20.1.tar.gz) = 50b6dccdba68142063fb74da7638f8f1fe60282f75caac4459349a262a13f24f38d3b4ed51a50ece5c7de04da39797f39ebf394e01ae6bea9ec0e65398fc62d3