From d2deb3d153bfbb347f4ad5e43571ebd2278e8f7a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Oct 24 2019 23:12:43 +0000
Subject: Update to 1.5.3


---

diff --git a/.gitignore b/.gitignore
index bc486cf..78c8fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /netcdf4-python-1.5.1.tar.gz
 /netcdf4-python-1.5.1.2.tar.gz
 /netcdf4-python-1.5.2.tar.gz
+/netcdf4-python-1.5.3.tar.gz
diff --git a/netcdf4-python-libs.patch b/netcdf4-python-libs.patch
index e8a0c0f..671aaae 100644
--- a/netcdf4-python-libs.patch
+++ b/netcdf4-python-libs.patch
@@ -1,7 +1,7 @@
-diff -up netcdf4-python-1.4.1rel/setup.py.libs netcdf4-python-1.4.1rel/setup.py
---- netcdf4-python-1.4.1rel/setup.py.libs	2018-10-06 20:02:02.828950332 -0600
-+++ netcdf4-python-1.4.1rel/setup.py	2018-10-06 20:04:05.198352238 -0600
-@@ -333,7 +333,7 @@ def _populate_hdf5_info(dirstosearch, in
+diff -up netcdf4-python-1.5.3rel/setup.py.libs netcdf4-python-1.5.3rel/setup.py
+--- netcdf4-python-1.5.3rel/setup.py.libs	2019-10-24 17:10:13.959050887 -0600
++++ netcdf4-python-1.5.3rel/setup.py	2019-10-24 17:10:13.963050895 -0600
+@@ -359,7 +359,7 @@ def _populate_hdf5_info(dirstosearch, in
          if HDF5_libdir is not None: lib_dirs.append(HDF5_libdir)
          if HDF5_incdir is not None: inc_dirs.append(HDF5_incdir)
  
@@ -10,7 +10,7 @@ diff -up netcdf4-python-1.4.1rel/setup.py.libs netcdf4-python-1.4.1rel/setup.py
  
  
  dirstosearch = [os.path.expanduser('~'), '/usr/local', '/sw', '/opt',
-@@ -399,7 +399,7 @@ NETCDF4_DIR environment variable not set
+@@ -425,7 +425,7 @@ NETCDF4_DIR environment variable not set
      if sys.platform == 'win32':
          libs.extend(['netcdf', 'zlib'])
      else:
diff --git a/netcdf4-python-norpath.patch b/netcdf4-python-norpath.patch
index 97708ae..d0d28d5 100644
--- a/netcdf4-python-norpath.patch
+++ b/netcdf4-python-norpath.patch
@@ -1,7 +1,25 @@
-diff -up netcdf4-python-1.4.1rel/setup.py.norpath netcdf4-python-1.4.1rel/setup.py
---- netcdf4-python-1.4.1rel/setup.py.norpath	2018-10-06 20:00:20.476745679 -0600
-+++ netcdf4-python-1.4.1rel/setup.py	2018-10-06 20:01:16.939410227 -0600
-@@ -445,7 +445,7 @@ NETCDF4_DIR environment variable not set
+diff -up netcdf4-python-1.5.3rel/setup.py.norpath netcdf4-python-1.5.3rel/setup.py
+--- netcdf4-python-1.5.3rel/setup.py.norpath	2019-10-22 09:39:48.000000000 -0600
++++ netcdf4-python-1.5.3rel/setup.py	2019-10-24 17:10:13.963050895 -0600
+@@ -359,7 +359,7 @@ def _populate_hdf5_info(dirstosearch, in
+         if HDF5_libdir is not None: lib_dirs.append(HDF5_libdir)
+         if HDF5_incdir is not None: inc_dirs.append(HDF5_incdir)
+ 
+-        libs.extend(['hdf5_hl', 'hdf5'])
++        #libs.extend(['hdf5_hl', 'hdf5'])
+ 
+ 
+ dirstosearch = [os.path.expanduser('~'), '/usr/local', '/sw', '/opt',
+@@ -425,7 +425,7 @@ NETCDF4_DIR environment variable not set
+     if sys.platform == 'win32':
+         libs.extend(['netcdf', 'zlib'])
+     else:
+-        libs.extend(['netcdf', 'z'])
++        libs.extend(['netcdf'])
+ 
+     if netCDF4_libdir is not None: lib_dirs.append(netCDF4_libdir)
+     if netCDF4_incdir is not None: inc_dirs.append(netCDF4_incdir)
+@@ -471,7 +471,7 @@ NETCDF4_DIR environment variable not set
  if sys.platform == 'win32':
      runtime_lib_dirs = []
  else:
diff --git a/netcdf4-python.spec b/netcdf4-python.spec
index 6910787..56ffeba 100644
--- a/netcdf4-python.spec
+++ b/netcdf4-python.spec
@@ -1,6 +1,6 @@
 Name:           netcdf4-python
-Version:        1.5.2
-Release:        2%{?dist}
+Version:        1.5.3
+Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
 License:        MIT
@@ -168,6 +168,9 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
 
 
 %changelog
+* Thu Oct 24 2019 Orion Poplawski <orion@nwra.com> - 1.5.3-1
+- Update to 1.5.3
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.2-2
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index 2f24e6f..4eee9b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (netcdf4-python-1.5.2.tar.gz) = 32020d580f47d18031df0e5ffc8aeff22a776d4c7bf90c5991fba7aee6f1d8dc3d042a9df61e148d374713360743c34d14681484bab894088842650a02f78a82
+SHA512 (netcdf4-python-1.5.3.tar.gz) = d5e4fe4d193f2cf622611af27ec1b9a538be0eb443633db7ebd9b9661b6e8de30055abf659e96e6ccc629aa422fdbc90df1fb1aa20e5aee1b58610ec91af9c43