From d647f2bdb8b073f55bc4f1065432b30f9702f3b9 Mon Sep 17 00:00:00 2001
From: Jos de Kloe <josdekloe@gmail.com>
Date: Sep 19 2021 17:48:44 +0000
Subject: Update to 2.1.4


---

diff --git a/.gitignore b/.gitignore
index 1fa507f..ced533a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /pygrib-2.1.1.tar.gz
 /pygrib-2.1.2.tar.gz
 /pygrib-2.1.3.tar.gz
+/pygrib-2.1.4.tar.gz
diff --git a/pygrib-zorder.patch b/pygrib-zorder.patch
deleted file mode 100644
index 6837f5d..0000000
--- a/pygrib-zorder.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- pygrib-2.1.3.unchanged/test/test_gaussian.py	2020-12-23 22:59:14.000000000 +0100
-+++ pygrib-2.1.3/test/test_gaussian.py	2021-09-09 11:22:45.494833677 +0200
-@@ -19,7 +19,7 @@ lons,lats = np.meshgrid(lons1,lats1)
- def test_gaussian():
-     fig = plt.figure()
-     ax = plt.axes(projection=ccrs.PlateCarree(central_longitude=0))
--    ax.coastlines()
-+    ax.coastlines(zorder=2)
-     ax.contourf(lons,lats,data,15)
-     # plot location of every 4th grid point
-     plt.scatter(lons[::4,::4].ravel(),lats[::4,::4].ravel(),1,marker='o',color='k',zorder=10)
---- pygrib-2.1.3.unchanged/test/test_reglatlon.py	2020-12-23 22:59:14.000000000 +0100
-+++ pygrib-2.1.3/test/test_reglatlon.py	2021-09-09 11:25:00.460655462 +0200
-@@ -22,7 +22,7 @@ lons,lats = np.meshgrid(lons1,lats1d)
- def test_reglatlon1():
-     fig = plt.figure()
-     ax = plt.axes(projection=ccrs.PlateCarree(central_longitude=0))
--    ax.coastlines()
-+    ax.coastlines(zorder=2)
-     ax.contourf(lons,lats,data,15,cmap=plt.cm.hot_r)
-     plt.title('%s Global Lat/Lon Grid' % grb.name)
-     return fig
-@@ -31,7 +31,7 @@ def test_reglatlon1():
- def test_reglatlon2():
-     fig = plt.figure()
-     ax = plt.axes(projection=ccrs.PlateCarree(central_longitude=0))
--    ax.coastlines()
-+    ax.coastlines(zorder=2)
-     ax.contourf(lons,lats,data2,15)
-     plt.title('%s Global Lat/Lon Grid' % grb2.name)
-     return fig
-@@ -44,7 +44,7 @@ def test_reglatlon3():
-     fig = plt.figure()
-     ax = plt.axes(projection=ccrs.PlateCarree(central_longitude=0))
-     ax.set_extent([lon1,lon2,lat1,lat2],crs=ccrs.PlateCarree())
--    ax.coastlines()
-+    ax.coastlines(zorder=2)
-     ax.contourf(lonsubset,latsubset,datsubset,15,cmap=plt.cm.hot_r)
-     plt.title('%s Regional Lat/Lon Grid' % grb.name)
-     return fig
diff --git a/pygrib.spec b/pygrib.spec
index af32adb..650219f 100644
--- a/pygrib.spec
+++ b/pygrib.spec
@@ -2,8 +2,8 @@
 %global __provides_exclude_from ^(%{python3_sitearch})/.*\\.so.*$
 
 Name:       pygrib
-Version:    2.1.3
-Release:    6%{?dist}
+Version:    2.1.4
+Release:    1%{?dist}
 Summary:    Python module for reading and modifying GRIB files
 
 License:    MIT
@@ -12,9 +12,6 @@ Source0:    https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{v
 
 # Adapt setup.py to prevent an rpath definition in the *.so file
 Patch1: %{name}-build.patch
-# Adapt tests using cartopy that fail due to wrong zorder of drawn
-# features (see https://github.com/jswhit/pygrib/issues/188)
-Patch2: %{name}-zorder.patch
 
 # exclude architectures not supported by eccodes
 # as explained in bugzilla #1562066
@@ -108,7 +105,6 @@ export MPLBACKEND=agg
 
 export TESTROOT=%{_builddir}/%{name}-%{version}-tmp-test
 mkdir $TESTROOT
-cp conftest.py $TESTROOT
 cp -R sampledata $TESTROOT
 cp -R test $TESTROOT
 
@@ -140,6 +136,9 @@ cd  $TESTROOT/test
 %{_mandir}/man1/grib_*
 
 %changelog
+* Sun Sep 19 2021 Jos de Kloe <josdekloe@gmail.com> 2.1.4-1
+- Update to 2.1.4 (#2005528)
+
 * Thu Sep 09 2021 Jos de Kloe <josdekloe@gmail.com> 2.1.3-6
 - Fix a zorder problem in the testsuite that was triggered by the move
   to matplotlib 3.5.0 in rawhide.
diff --git a/sources b/sources
index 15ae5c6..172dede 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pygrib-2.1.3.tar.gz) = 900fa9f7bd2a8d1a5daeafa3bf03a3317089c794a6d8a137a48e7d3eb2bc361aed0d2b99a35d680a4a9f1783e81c351a74bf5ea59dd58fc17e9682dc5f555800
+SHA512 (pygrib-2.1.4.tar.gz) = d2720ef82969226289e2a3185e65acc10e013e64e55adb941053ff2c29eb7c0ada2fd29a39735fbdc71bec61c1510c0b06f8e13ff562f8404a716c560bff50cb