- added hdf5-filter-fix (fix heisenbug in HDF5 reading code); release 2

diff --git a/netcdf-hdf5-filter-fix.patch b/netcdf-hdf5-filter-fix.patch
new file mode 100644 (file)
index 0000000..1883c12
--- /dev/null
+++ b/netcdf-hdf5-filter-fix.patch
@@ -0,0 +1,10 @@
+--- netcdf-c-4.7.4/libhdf5/hdf5open.c.orig     2020-03-27 17:05:29.000000000 +0100
++++ netcdf-c-4.7.4/libhdf5/hdf5open.c  2020-11-15 21:17:09.616118662 +0100
+@@ -1012,6 +1012,7 @@
+             }
+             break;
+         }
++        cd_nelems = CD_NELEMS_ZLIB; /* restore */
+     }
+     return NC_NOERR;
+ }

diff --git a/netcdf.spec b/netcdf.spec
index 1ca9e922b4d58e544f4308c3b118598ac6fc80e2..0c54b2f04e0ef1918b0e60888f571bd372636fff 100644 (file)
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -10,11 +10,12 @@ Summary:    NetCDF: Network Common Data Form
 Summary(pl.UTF-8):     NetCDF: obsługa wspólnego sieciowego formatu danych
 Name:          netcdf
 Version:       4.7.4
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 Source0:       ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-c-%{version}.tar.gz
 # Source0-md5: 3e0a97e6abb9a989f8a8a2e395473597
+Patch0:                %{name}-hdf5-filter-fix.patch
 URL:           https://www.unidata.ucar.edu/software/netcdf/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -85,6 +86,7 @@ Statyczna wersja biblioteki netCDF dla C.
 
 %prep
 %setup -q -n %{name}-c-%{version}
+%patch0 -p1
 
 %if %{without tests_net}
 # assumes at least 2 processors are available via MPI
@@ -116,8 +118,7 @@ Statyczna wersja biblioteki netCDF dla C.
 %{__make}
 
 %if %{with tests}
-%{__make} -j1 check || cat ncdump/test-suite.log
-exit 1
+%{__make} -j1 check
 %endif
 
 %install