Update to 1.6.1

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -21,3 +21,11 @@
 /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
+/netcdf4-python-1.5.4.tar.gz
+/netcdf4-python-1.5.5.1.tar.gz
+/netcdf4-python-1.5.6.tar.gz
+/netcdf4-python-1.5.7.tar.gz
+/netcdf4-python-1.5.8.tar.gz
+/netcdf4-python-1.6.0.tar.gz
+/netcdf4-python-1.6.1.tar.gz

netcdf4-python-libs.patch

@@ -1,21 +0,0 @@
-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
-         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',
-@@ -399,7 +399,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)

netcdf4-python-norpath.patch

@@ -1,7 +1,7 @@
-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.8rel/setup.py.norpath netcdf4-python-1.5.8rel/setup.py
+--- netcdf4-python-1.5.8rel/setup.py.norpath	2021-10-31 07:25:17.000000000 -0600
++++ netcdf4-python-1.5.8rel/setup.py	2022-01-19 19:37:47.204865578 -0700
+@@ -493,7 +493,7 @@ NETCDF4_DIR environment variable not set
  if sys.platform == 'win32':
      runtime_lib_dirs = []
  else:

netcdf4-python.spec

@@ -1,5 +1,5 @@
 Name:           netcdf4-python
-Version:        1.5.2
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Python/numpy interface to netCDF
 
@@ -9,9 +9,6 @@ Source0:        https://github.com/Unidata/netcdf4-python/archive/v%{version}rel
 # No rpath for library
 # http://code.google.com/p/netcdf4-python/issues/detail?id=138
 Patch0:         netcdf4-python-norpath.patch
-# Don't link against hdf5 and z libraries
-# http://code.google.com/p/netcdf4-python/issues/detail?id=139
-Patch1:         netcdf4-python-libs.patch
 
 %if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 BuildRequires:  python2-devel
@@ -110,10 +107,11 @@ containing vlens, and vlens containing compound types) are not supported.
 %prep
 %setup -q -n %{name}-%{version}rel
 %patch0 -p1 -b .norpath
-%patch1 -p1 -b .libs
 
 
 %build
+# Set to get libs from ncconfig to avoid directly linking to -lhdf5
+export USE_NCCONFIG=1
 %if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 %py2_build
 %endif
@@ -142,32 +140,93 @@ PYTHONPATH=$(echo ../build/lib.*%{python2_version}) %{__python2} run_all.py
 %endif
 %ifarch s390x
 # FAIL: runTest (tst_compoundvar.VariablesTestCase) -> assert (cmptype4 == dtype4a) # data type should be aligned
-PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py || :
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py || :
 %else
-PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py
 %endif
 
 
 %files
-%license COPYING
+%license LICENSE
 %{_bindir}/nc3tonc4
 %{_bindir}/nc4tonc3
 %{_bindir}/ncinfo
 
 %if ! ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
 %files -n python2-netcdf4
-%license COPYING
+%license LICENSE
 %doc Changelog docs examples README.md
 %{python2_sitearch}/*
 %endif
 
 %files -n python%{python3_pkgversion}-netcdf4
-%license COPYING
+%license LICENSE
 %doc Changelog docs examples README.md
 %{python3_sitearch}/*
 
 
 %changelog
+* Fri Sep 23 2022 Orion Poplawski <orion@nwra.com> - 1.6.1-1
+- Update to 1.6.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jun 26 2022 Orion Poplawski <orion@nwra.com> - 1.6.0-1
+- Update to 1.6.0
+
+* Mon Jun 20 2022 Charalampos Stratakis <cstratak@redhat.com> - 1.5.8-3
+- Fix FTBFS with the latest setuptools
+Resolves: rhbz#2097125
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.8-2
+- Rebuilt for Python 3.11
+
+* Thu Jan 20 2022 Orion Poplawski <orion@nwra.com> - 1.5.8-1
+- Update to 1.5.8
+
+* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 1.5.7-2
+- Rebuild for hdf5 1.12.1
+
+* Mon Aug 30 2021 Orion Poplawski <orion@nwra.com> - 1.5.7-1
+- Update to 1.5.7
+
+* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 1.5.6-4
+- Rebuild for netcdf 4.8.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.5.6-2
+- Rebuilt for Python 3.10
+
+* Sun Feb 14 2021 Orion Poplawski <orion@nwra.com> - 1.5.6-1
+- Update to 1.5.6
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 24 2021 Orion Poplawski <orion@nwra.com> - 1.5.5.1-1
+- Update to 1.5.5.1
+
+* Thu Sep 17 20:16:46 MDT 2020 Orion Poplawski <orion@nwra.com> - 1.5.4-1
+- Update to 1.5.4
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-3
+- Rebuilt for Python 3.9
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* 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)
+
 * Tue Sep 10 2019 Orion Poplawski <orion@nwra.com> - 1.5.2-1
 - Update to 1.5.2
 

sources

@@ -1 +1 @@
-SHA512 (netcdf4-python-1.5.2.tar.gz) = 32020d580f47d18031df0e5ffc8aeff22a776d4c7bf90c5991fba7aee6f1d8dc3d042a9df61e148d374713360743c34d14681484bab894088842650a02f78a82
+SHA512 (netcdf4-python-1.6.1.tar.gz) = 867fc264df7d2151cf3a684bd6f0f0c1e1efd48c3cae4c2c0f529697f3c2235c8bc87e859f88209ba59e33793a81899a12a794e5ca1522fa53cebf348592f022