PR#2: Version 4.7.4 - rpms/netcdf - src.fedoraproject.org

rpms / netcdf

#2 Version 4.7.4

Closed 3 years ago by orion. Opened 3 years ago by zbyszek.

rpms/ zbyszek/netcdf v474 into master

Version 4.7.4

Zbigniew Jędrzejewski-Szmek • 3 years ago

a5e23e7

b3e42ac54d06249c6e474c60708e19a5565d6f76.patch

file added

+22

		`@@ -0,0 +1,22 @@`
		`+ From b3e42ac54d06249c6e474c60708e19a5565d6f76 Mon Sep 17 00:00:00 2001`
		`+ From: Orion Poplawski <orion@nwra.com>`
		`+ Date: Wed, 24 Jun 2020 20:28:15 -0600`
		`+ Subject: [PATCH] Fix wrong header include in testing HDF5 for zlib`
		`+`
		`+ ---`
		`+ configure.ac \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/configure.ac b/configure.ac`
		`+ index 2db93f9e2..5b115779f 100644`
		`+ --- a/configure.ac`
		`+ +++ b/configure.ac`
		`+ @@ -1058,7 +1058,7 @@ if test "x$enable_hdf5" = xyes; then`
		`+ AC_CHECK_HEADERS([hdf5.h], [], [AC_MSG_ERROR([Compiling a test with HDF5 failed. Either hdf5.h cannot be found, or config.log should be checked for other reason.])])`
		`+`
		`+ # Was HDF5 built with zlib as netCDF requires?`
		`+ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "H5pubconf.h"],`
		`+ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "H5public.h"],`
		`+ [[#if !H5_HAVE_ZLIB_H`
		`+ # error`
		`+ #endif]`

netcdf.spec

file modified

+16 -6

		`@@ -1,12 +1,15 @@`
		`Name: netcdf`
		`- Version: 4.7.3`
		`- Release: 4%{?dist}`
		`+ Version: 4.7.4`
		`+ Release: 1%{?dist}`
		`Summary: Libraries for the Unidata network Common Data Form`

		`License: NetCDF`
		`URL: http://www.unidata.ucar.edu/software/netcdf/`
		`Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}/%{name}-%{version}.tar.gz`

		`+ Patch0: https://github.com/Unidata/netcdf-c/commit/b3e42ac54d06249c6e474c60708e19a5565d6f76.patch`
		`+`
		`+ BuildRequires: autogen`
		`BuildRequires: libtool`
		`BuildRequires: chrpath`
		`BuildRequires: doxygen`
		`@@ -40,6 +43,8 @@`
		`%global mpi_list %{?mpi_list} openmpi`
		`%endif`

		`+ %global libnetcdf_so_version 18`
		`+`
		`%description`
		`NetCDF (network Common Data Form) is an interface for array-oriented`
		`data access and a freely-distributed collection of software libraries`
		`@@ -164,8 +169,9 @@`
		`%prep`
		`%autosetup -p1 -n %{name}-c-%{version}`

		`-`
		`%build`
		`+ autoreconf -iv`
		`+`
		`#Do out of tree builds`
		`%global _configure ../configure`
		`#Common configure options`
		`@@ -259,7 +265,7 @@`
		`%{_bindir}/ncdump`
		`%{_bindir}/ncgen`
		`%{_bindir}/ncgen3`
		`- %{_libdir}/.so.15`
		`+ %{_libdir}/.so.%{libnetcdf_so_version}`
		`%{_mandir}/man1/*`

		`%files devel`
		`@@ -287,7 +293,7 @@`
		`%{_libdir}/mpich/bin/ncdump`
		`%{_libdir}/mpich/bin/ncgen`
		`%{_libdir}/mpich/bin/ncgen3`
		`- %{_libdir}/mpich/lib/.so.15`
		`+ %{_libdir}/mpich/lib/.so.%{libnetcdf_so_version}`
		`%doc %{_libdir}/mpich/share/man/man1/.1`

		`%files mpich-devel`
		`@@ -316,7 +322,7 @@`
		`%{_libdir}/openmpi/bin/ncdump`
		`%{_libdir}/openmpi/bin/ncgen`
		`%{_libdir}/openmpi/bin/ncgen3`
		`- %{_libdir}/openmpi/lib/.so.15`
		`+ %{_libdir}/openmpi/lib/.so.%{libnetcdf_so_version}`
		`%doc %{_libdir}/openmpi/share/man/man1/.1`

		`%files openmpi-devel`
		`@@ -339,6 +345,10 @@`


		`%changelog`
		`+ * Tue Nov 24 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.4-1`
		`+ - Update to latest version. This includes an SOVERSION bump of the`
		`+ libnetcdf library from 15 to 18.`
		`+`
		`* Sun Sep 6 2020 Orion Poplawski <orion@nwra.com> - 4.7.3-4`
		`- Work around UCX segfault issue (FTBFS bz#1864189)`

zbyszek commented 3 years ago

Because of the patch to fix configure.ac, autoreconf is executed to also
update ./configure.

Note that this includes an SOVERSION bump.

[I was 100% sure I already opened this PR, but apparently not.]

I rebuilt the dependent packages locally. If you don't object, I'd merge this and rebuild this and all dependents in a side-tag:

$ dnf repoquery --whatrequires 'libnetcdf.so.15()(64bit)' --qf '%{sourcerpm}'|sed -r 's/-[0-9].*//'|uniq
Last metadata expiration check: 4:31:27 ago on Fri 27 Nov 2020 02:25:15 PM CET.
GMT
LabPlot
R-ncdf4
bes
bout++
dx
eccodes
exodusii
gdal
gdl
genesis-simulator
grace
grads
grass
grib_api
gtatool
libminc
ncl
nco
ncview
netcdf
netcdf-cxx
netcdf-fortran
netcdf-perl
netcdf4-python
octave-netcdf
paraview
pymol
qgis
vtk
wgrib2

zbyszek commented 3 years ago

It turns out that the amd64 builds are fine, but there's trouble with i386 and some other arches. I'll investigate this when I have some time free...

orion commented 3 years ago

I'm sorry that this got misfiled in my email folders so I didn't see this until just now. I was just about to start this update myself. I'm closing this in favor of https://src.fedoraproject.org/rpms/netcdf/pull-request/3.

However, I'm debating about whether or not to do the update. There were reports of backwards-incompatible changes in 4.7.4 that have been reverted in the upcoming 4.8.0 release.