- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

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

.gitignore

@@ -15,3 +15,6 @@ netcdf-4.1.1.tar.gz
 /netcdf-4.4.0.tar.gz
 /netcdf-4.4.1.tar.gz
 /netcdf-4.4.1.1.tar.gz
+/netcdf-4.6.2.1.tar.gz
+/netcdf-4.6.3.tar.gz
+/netcdf-4.7.0.tar.gz

netcdf-err.patch

@@ -1,11 +0,0 @@
-diff -up netcdf-c-4.4.1.1/h5_test/tst_h_par.c.err netcdf-c-4.4.1.1/h5_test/tst_h_par.c
---- netcdf-c-4.4.1.1/h5_test/tst_h_par.c.err	2016-11-21 11:27:08.000000000 -0700
-+++ netcdf-c-4.4.1.1/h5_test/tst_h_par.c	2016-11-29 11:34:59.433806850 -0700
-@@ -11,6 +11,7 @@
-    $Id: tst_h_par.c,v 1.15 2010/05/25 13:53:04 ed Exp $
- */
- #include <nc_tests.h>
-+#include "err_macros.h"
- #include <hdf5.h>
- 
- /* Defining USE_MPE causes the MPE trace library to be used (and you

netcdf.spec

@@ -1,15 +1,11 @@
 Name:           netcdf
-Version:        4.4.1.1
-Release:        10%{?dist}
+Version:        4.7.0
+Release:        2%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
-Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://www.unidata.ucar.edu/software/netcdf/
 Source0:        https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# Add missing #include "err_macros.h"
-# https://github.com/Unidata/netcdf-c/pull/333
-Patch0:         netcdf-err.patch
 
 BuildRequires:  libtool
 BuildRequires:  chrpath
@@ -37,13 +33,6 @@ Requires:       hdf5%{?_isa} = %{_hdf5_version}
 %endif
 %endif
 
-%if 0%{?fedora} < 26
-%ifarch s390 s390x
-# No openmpi on s390(x)
-%global with_openmpi 0
-%endif
-%endif
-
 %if %{with_mpich}
 %global mpi_list mpich
 %endif
@@ -85,7 +74,6 @@ NetCDF data is:
 
 %package devel
 Summary:        Development files for netcdf
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig%{?_isa}
 Requires:       hdf5-devel%{?_isa}
@@ -98,7 +86,6 @@ man pages.
 
 %package static
 Summary:        Static libs for netcdf
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description static
@@ -108,7 +95,6 @@ This package contains the netCDF C static libs.
 %if %{with_mpich}
 %package mpich
 Summary: NetCDF mpich libraries
-Group: Development/Libraries
 Requires: hdf5-mpich%{?_isa} = %{_hdf5_version}
 BuildRequires: mpich-devel
 BuildRequires: hdf5-mpich-devel >= 1.8.4
@@ -121,7 +107,6 @@ NetCDF parallel mpich libraries
 
 %package mpich-devel
 Summary: NetCDF mpich development files
-Group: Development/Libraries
 Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
 Requires: pkgconfig%{?_isa}
 Requires: hdf5-mpich-devel%{?_isa}
@@ -135,7 +120,6 @@ NetCDF parallel mpich development files
 
 %package mpich-static
 Summary: NetCDF mpich static libraries
-Group: Development/Libraries
 Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
 Provides: %{name}-mpich2-static = %{version}-%{release}
 Obsoletes: %{name}-mpich2-static < 4.3.0-4
@@ -148,7 +132,6 @@ NetCDF parallel mpich static libraries
 %if %{with_openmpi}
 %package openmpi
 Summary: NetCDF openmpi libraries
-Group: Development/Libraries
 Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version}
 BuildRequires: openmpi-devel
 BuildRequires: hdf5-openmpi-devel >= 1.8.4
@@ -159,7 +142,6 @@ NetCDF parallel openmpi libraries
 
 %package openmpi-devel
 Summary: NetCDF openmpi development files
-Group: Development/Libraries
 Requires: %{name}-openmpi%{_isa} = %{version}-%{release}
 Requires: openmpi-devel%{?_isa}
 Requires: pkgconfig%{?_isa}
@@ -172,7 +154,6 @@ NetCDF parallel openmpi development files
 
 %package openmpi-static
 Summary: NetCDF openmpi static libraries
-Group: Development/Libraries
 Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release}
 
 %description openmpi-static
@@ -181,36 +162,31 @@ NetCDF parallel openmpi static libraries
 
 
 %prep
-%setup -q -n %{name}-c-%{version}
-%patch0 -p1 -b .err
-m4 libsrc/ncx.m4 > libsrc/ncx.c
+%autosetup -p1 -n %{name}-c-%{version}
 
 
 %build
 #Do out of tree builds
 %global _configure ../configure
 #Common configure options
+export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
 %global configure_opts \\\
            --enable-shared \\\
            --enable-netcdf-4 \\\
            --enable-dap \\\
            --enable-extra-example-tests \\\
            CPPFLAGS=-I%{_includedir}/hdf \\\
-           LIBS="-ldf -ljpeg -ltirpc" \\\
+           LIBS="-ltirpc" \\\
            --enable-hdf4 \\\
            --disable-dap-remote-tests \\\
 %{nil}
-export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
-
-# Upstream libtool is stripping -spec from link command
-libtoolize --force
 
 # Serial build
 mkdir build
 pushd build
 ln -s ../configure .
 %configure %{configure_opts}
-make %{?_smp_mflags}
+%make_build
 popd
 
 # MPI builds
@@ -229,12 +205,8 @@ do
     --includedir=%{_includedir}/$mpi-%{_arch} \
     --datarootdir=%{_libdir}/$mpi/share \
     --mandir=%{_libdir}/$mpi/share/man \
-    %ifnarch s390 s390x
     --enable-parallel-tests
-    %else
-      %{nil}
-    %endif
-  make %{?_smp_mflags}
+  %make_build
   module purge
   popd
 done
@@ -259,6 +231,8 @@ done
 # Set to 1 to fail if tests fail
 fail=1
 make -C build check || ( cat build/*/test-suite.log && exit $fail )
+# Allow openmpi to run with more processes than cores
+export OMPI_MCA_rmaps_base_oversubscribe=1
 for mpi in %{mpi_list}
 do
   module load mpi/$mpi-%{_arch}
@@ -267,24 +241,25 @@ do
 done
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
-%doc COPYRIGHT README.md RELEASE_NOTES.md
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
 %{_bindir}/nccopy
 %{_bindir}/ncdump
 %{_bindir}/ncgen
 %{_bindir}/ncgen3
-%{_libdir}/*.so.11*
+%{_libdir}/*.so.15*
 %{_mandir}/man1/*
 
 %files devel
 %doc examples
 %{_bindir}/nc-config
 %{_includedir}/netcdf.h
+%{_includedir}/netcdf_aux.h
+%{_includedir}/netcdf_filter.h
 %{_includedir}/netcdf_meta.h
 %{_includedir}/netcdf_mem.h
 %{_libdir}/libnetcdf.settings
@@ -297,17 +272,23 @@ done
 
 %if %{with_mpich}
 %files mpich
-%doc COPYRIGHT README.md RELEASE_NOTES.md
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
 %{_libdir}/mpich/bin/nccopy
 %{_libdir}/mpich/bin/ncdump
 %{_libdir}/mpich/bin/ncgen
 %{_libdir}/mpich/bin/ncgen3
-%{_libdir}/mpich/lib/*.so.11*
+%{_libdir}/mpich/lib/*.so.15*
 %doc %{_libdir}/mpich/share/man/man1/*.1*
 
 %files mpich-devel
 %{_libdir}/mpich/bin/nc-config
-%{_includedir}/mpich-%{_arch}
+%{_includedir}/mpich-%{_arch}/netcdf.h
+%{_includedir}/mpich-%{_arch}/netcdf_aux.h
+%{_includedir}/mpich-%{_arch}/netcdf_filter.h
+%{_includedir}/mpich-%{_arch}/netcdf_meta.h
+%{_includedir}/mpich-%{_arch}/netcdf_mem.h
+%{_includedir}/mpich-%{_arch}/netcdf_par.h
 %{_libdir}/mpich/lib/libnetcdf.settings
 %{_libdir}/mpich/lib/*.so
 %{_libdir}/mpich/lib/pkgconfig/%{name}.pc
@@ -319,17 +300,23 @@ done
 
 %if %{with_openmpi}
 %files openmpi
-%doc COPYRIGHT README.md RELEASE_NOTES.md
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
 %{_libdir}/openmpi/bin/nccopy
 %{_libdir}/openmpi/bin/ncdump
 %{_libdir}/openmpi/bin/ncgen
 %{_libdir}/openmpi/bin/ncgen3
-%{_libdir}/openmpi/lib/*.so.11*
+%{_libdir}/openmpi/lib/*.so.15*
 %doc %{_libdir}/openmpi/share/man/man1/*.1*
 
 %files openmpi-devel
 %{_libdir}/openmpi/bin/nc-config
-%{_includedir}/openmpi-%{_arch}
+%{_includedir}/openmpi-%{_arch}/netcdf.h
+%{_includedir}/openmpi-%{_arch}/netcdf_aux.h
+%{_includedir}/openmpi-%{_arch}/netcdf_filter.h
+%{_includedir}/openmpi-%{_arch}/netcdf_meta.h
+%{_includedir}/openmpi-%{_arch}/netcdf_mem.h
+%{_includedir}/openmpi-%{_arch}/netcdf_par.h
 %{_libdir}/openmpi/lib/libnetcdf.settings
 %{_libdir}/openmpi/lib/*.so
 %{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
@@ -341,6 +328,21 @@ done
 
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 17 2019 Orion Poplawski <orion@nwra.com> - 4.7.0-1
+- Update to 4.7.0
+
+* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.3-1
+- Update to 4.6.3
+
+* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 4.4.1.1-12
+- Rebuild for openmpi 3.1.3
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-9210fd5355bee868684d9b8f83064aa6  netcdf-4.4.1.1.tar.gz
+SHA512 (netcdf-4.7.0.tar.gz) = 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a