From 4ebb4918ddf640a51ed2c8842f016597676f1c32 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 1 May 2020 02:28:35 -0400
Subject: [PATCH] Update to latest release candidate.

---
 .gitignore                                     |  1 +
 0001-Increase-tolerance-for-new-FreeType.patch |  6 +++---
 python-cartopy.spec                            | 11 +++++++----
 sources                                        |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8c5e5f..21df21a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /Cartopy-0.17.0.tar.gz
 /Cartopy-0.18.0b1.tar.gz
 /Cartopy-0.18.0b2.tar.gz
+/Cartopy-0.18.0rc1.tar.gz
diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0001-Increase-tolerance-for-new-FreeType.patch
index b2d2e5e..7583f80 100644
--- a/0001-Increase-tolerance-for-new-FreeType.patch
+++ b/0001-Increase-tolerance-for-new-FreeType.patch
@@ -1,4 +1,4 @@
-From 158666202a99c38dd99002e4fb7fea48d55f56e3 Mon Sep 17 00:00:00 2001
+From 95dc2e69ced6d28d1a9490603f860a060765dfdb 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] Increase tolerance for new FreeType.
@@ -23,10 +23,10 @@ index 71c15453..e3ab3660 100644
  
  @pytest.mark.natural_earth
 diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py
-index a268d366..04242fdc 100644
+index 80c40c6c..5724e939 100644
 --- a/lib/cartopy/tests/mpl/test_gridliner.py
 +++ b/lib/cartopy/tests/mpl/test_gridliner.py
-@@ -161,6 +161,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION:
+@@ -165,6 +165,11 @@ elif (6, 0, 0) <= ccrs.PROJ4_VERSION:
      # Better Robinson projection causes some text movement.
      grid_label_inline_tol += 1.2
  
diff --git a/python-cartopy.spec b/python-cartopy.spec
index 25702f8..f6df43a 100644
--- a/python-cartopy.spec
+++ b/python-cartopy.spec
@@ -5,13 +5,13 @@
 %bcond_with network
 
 Name:           python-%{srcname}
-Version:        0.18.0~b2
+Version:        0.18.0~rc1
 Release:        1%{?dist}
 Summary:        Cartographic Python library with Matplotlib visualisations
 
 License:        LGPLv3
 URL:            http://scitools.org.uk/cartopy/docs/latest/
-Source0:        %pypi_source %{Srcname} 0.18.0b2
+Source0:        %pypi_source %{Srcname} 0.18.0rc1
 # Set location of Fedora-provided pre-existing data.
 Source1:        siteconfig.py
 # Might not go upstream in current form.
@@ -94,7 +94,7 @@ Data files for %{srcname}.
 
 
 %prep
-%autosetup -n %{Srcname}-0.18.0b2 -p1
+%autosetup -n %{Srcname}-0.18.0rc1 -p1
 cp -a %SOURCE1 lib/cartopy/
 
 # Remove bundled egg-info
@@ -132,10 +132,13 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" PYTHONDONTWRITEBYTECODE=1 MPLBACKEN
 
 %files -n python3-%{srcname}
 %{python3_sitearch}/cartopy
-%{python3_sitearch}/%{Srcname}-0.18.0b2-py*.egg-info
+%{python3_sitearch}/%{Srcname}-0.18.0rc1-py*.egg-info
 
 
 %changelog
+* Fri May 01 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.18.0~rc1-1
+- Update to latest release candidate
+
 * Mon Apr 13 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.18.0~b2-1
 - Update to latest beta
 
diff --git a/sources b/sources
index edf4a18..b1b1174 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Cartopy-0.18.0b2.tar.gz) = ff6d767e940bcd89ca01d7d97e1e3efaa5979e6d96c4495c718f2c8161cb22a99e1164e8c91ac6125290f6e856d099797b7099763bc296c1d1583e9b79804bc5
+SHA512 (Cartopy-0.18.0rc1.tar.gz) = 4703f22712b2077cf319d8b83f6c97bc83a062b5e405cf1ccc4c5e96379f599c7209d4831624ecb0939b6f5f9b1ab5edde3b6355077aa896bbf0c8344a987456