.gitignore

@@ -12,9 +12,3 @@ netcdf-4.1.1.tar.gz
 /netcdf-4.3.2.tar.gz
 /netcdf-4.3.3.tar.gz
 /netcdf-4.3.3.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-pkgconfig.patch

@@ -0,0 +1,25 @@
+diff -up netcdf-4.2.1-rc1/nc-config.in.pkgconfig netcdf-4.2.1-rc1/nc-config.in
+--- netcdf-4.2.1-rc1/nc-config.in.pkgconfig	2012-06-18 12:33:10.000000000 -0600
++++ netcdf-4.2.1-rc1/nc-config.in	2012-06-20 16:44:29.292019812 -0600
+@@ -6,12 +6,10 @@
+ 
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+ 
+ cc="@CC@"
+ cflags=" -I${includedir} @CPPFLAGS@" 
+-libs="-L${libdir} @NC_LIBS@"
+ has_dap="@HAS_DAP@"
+ has_nc2="@HAS_NC2@"
+ has_nc4="@HAS_NC4@"
+@@ -189,7 +187,7 @@ while test $# -gt 0; do
+        	;;
+ 
+      --libs)
+-       	echo $libs
++       	pkg-config netcdf --libs
+        	;;
+ 
+     --prefix)

netcdf.spec

@@ -1,22 +1,26 @@
 Name:           netcdf
-Version:        4.7.0
-Release:        2%{?dist}
+Version:        4.3.3.1
+Release:        1%{?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
+# Use github tarball - the unidata download is missing files
+#Source0:        https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz
+# Use pkgconfig in nc-config to avoid multi-lib issues
+Patch0:         netcdf-pkgconfig.patch
 
-BuildRequires:  libtool
 BuildRequires:  chrpath
 BuildRequires:  doxygen
 BuildRequires:  hdf-static
-BuildRequires:  hdf5-devel
+BuildRequires:  hdf5-devel >= 1.8.4
 BuildRequires:  gawk
 BuildRequires:  libcurl-devel
 BuildRequires:  m4
 BuildRequires:  zlib-devel
-%ifarch %{valgrind_arches}
+%ifnarch s390 s390x %{arm}
 BuildRequires:  valgrind
 %endif
 #mpiexec segfaults if ssh is not present
@@ -24,14 +28,23 @@ BuildRequires:  valgrind
 BuildRequires:  openssh-clients
 Requires:       hdf5%{?_isa} = %{_hdf5_version}
 
+# Don't let mpi versions provide libraries
+%global __provides_exclude_from ^%{_libdir}/(mpich|openmpi)
+# Don't require hdf5 library, might be mpi, use explicit requires
+%global __requires_exclude ^libhdf5
+
 %global with_mpich 1
 %global with_openmpi 1
-%if 0%{?rhel} && 0%{?rhel} <= 6
+%if 0%{?rhel} <= 6
 %ifarch ppc64
 # No mpich on ppc64 in EL6
 %global with_mpich 0
 %endif
 %endif
+%ifarch s390 s390x
+# No openmpi on s390(x)
+%global with_openmpi 0
+%endif
 
 %if %{with_mpich}
 %global mpi_list mpich
@@ -74,6 +87,7 @@ 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}
@@ -86,6 +100,7 @@ man pages.
 
 %package static
 Summary:        Static libs for netcdf
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description static
@@ -95,6 +110,8 @@ This package contains the netCDF C static libs.
 %if %{with_mpich}
 %package mpich
 Summary: NetCDF mpich libraries
+Group: Development/Libraries
+Requires: mpich%{?_isa}
 Requires: hdf5-mpich%{?_isa} = %{_hdf5_version}
 BuildRequires: mpich-devel
 BuildRequires: hdf5-mpich-devel >= 1.8.4
@@ -107,7 +124,9 @@ NetCDF parallel mpich libraries
 
 %package mpich-devel
 Summary: NetCDF mpich development files
+Group: Development/Libraries
 Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
+Requires: mpich%{?_isa}
 Requires: pkgconfig%{?_isa}
 Requires: hdf5-mpich-devel%{?_isa}
 Requires: libcurl-devel%{?_isa}
@@ -120,6 +139,7 @@ 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
@@ -132,6 +152,8 @@ NetCDF parallel mpich static libraries
 %if %{with_openmpi}
 %package openmpi
 Summary: NetCDF openmpi libraries
+Group: Development/Libraries
+Requires: openmpi%{?_isa}
 Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version}
 BuildRequires: openmpi-devel
 BuildRequires: hdf5-openmpi-devel >= 1.8.4
@@ -142,6 +164,7 @@ 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}
@@ -154,6 +177,7 @@ 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
@@ -162,31 +186,32 @@ NetCDF parallel openmpi static libraries
 
 
 %prep
-%autosetup -p1 -n %{name}-c-%{version}
+%setup -q
+%patch0 -p1 -b .pkgconfig
 
 
 %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="-ltirpc" \\\
+           LIBS="-ldf -ljpeg" \\\
            --enable-hdf4 \\\
            --disable-dap-remote-tests \\\
 %{nil}
+export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
 
 # Serial build
 mkdir build
 pushd build
 ln -s ../configure .
 %configure %{configure_opts}
-%make_build
+make %{?_smp_mflags}
 popd
 
 # MPI builds
@@ -205,8 +230,12 @@ do
     --includedir=%{_includedir}/$mpi-%{_arch} \
     --datarootdir=%{_libdir}/$mpi/share \
     --mandir=%{_libdir}/$mpi/share/man \
+    %ifnarch s390 s390x
     --enable-parallel-tests
-  %make_build
+    %else
+      %{nil}
+    %endif
+  make %{?_smp_mflags}
   module purge
   popd
 done
@@ -228,40 +257,37 @@ done
 
 
 %check
-# 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
+make -C build check
+# This is hanging here:
+# Testing very simple parallel I/O with 4 processors...
+# *** tst_parallel testing very basic parallel access.
 for mpi in %{mpi_list}
 do
   module load mpi/$mpi-%{_arch}
-  make -C $mpi check || ( cat $mpi/*/test-suite.log && exit $fail )
+  make -C $mpi check
   module purge
 done
 
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 
 %files
-%license COPYRIGHT
-%doc README.md RELEASE_NOTES.md
+%doc COPYRIGHT README.md RELEASE_NOTES.md
 %{_bindir}/nccopy
 %{_bindir}/ncdump
 %{_bindir}/ncgen
 %{_bindir}/ncgen3
-%{_libdir}/*.so.15*
+%{_libdir}/*.so.7*
 %{_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
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/netcdf.pc
@@ -272,23 +298,17 @@ done
 
 %if %{with_mpich}
 %files mpich
-%license COPYRIGHT
-%doc README.md RELEASE_NOTES.md
+%doc COPYRIGHT 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.15*
+%{_libdir}/mpich/lib/*.so.7*
 %doc %{_libdir}/mpich/share/man/man1/*.1*
 
 %files mpich-devel
 %{_libdir}/mpich/bin/nc-config
-%{_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
+%{_includedir}/mpich-%{_arch}
 %{_libdir}/mpich/lib/libnetcdf.settings
 %{_libdir}/mpich/lib/*.so
 %{_libdir}/mpich/lib/pkgconfig/%{name}.pc
@@ -300,23 +320,17 @@ done
 
 %if %{with_openmpi}
 %files openmpi
-%license COPYRIGHT
-%doc README.md RELEASE_NOTES.md
+%doc COPYRIGHT 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.15*
+%{_libdir}/openmpi/lib/*.so.7*
 %doc %{_libdir}/openmpi/share/man/man1/*.1*
 
 %files openmpi-devel
 %{_libdir}/openmpi/bin/nc-config
-%{_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
+%{_includedir}/openmpi-%{_arch}
 %{_libdir}/openmpi/lib/libnetcdf.settings
 %{_libdir}/openmpi/lib/*.so
 %{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
@@ -328,96 +342,6 @@ 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
-
-* Mon Apr 09 2018 Orion Poplawski <orion@nwra.com> - 4.4.1.1-9
-- Run libtoolize to not strip link flags (bug #1548732)
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-7
-- Rebuild for gcc 8.0
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Dec 08 2016 Dan Horák <dan[at]danny.cz> - 4.4.1.1-3
-- Enable openmpi for s390(x) on F>=26
-
-* Tue Dec 06 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-2
-- Rebuild for hdf5 1.8.18
-
-* Tue Nov 29 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1.1-1
-- Update to 4.4.1.1
-- Add patch to fix mpi tests compilation
-
-* Fri Oct 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1-4
-- Rebuild for openmpi 2.0
-
-* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 4.4.1-3
-- No valgrind on MIPS
-- Enable valgrind on arm
-
-* Thu Jul 7 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1-2
-- Add upstream patch to fix hashmap issue
-
-* Wed Jun 29 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.1-1
-- Update to 4.4.1
-
-* Tue Jun 28 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.0-4
-- Drop mpiexec hack
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.0-2
-- Rebuild ncx.c to fix arm build
-
-* Thu Jan 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.4.0-1
-- Update to 4.4.0
-- Add patch to fix incorrect char definitions
-
-* Sat Nov 07 2015 Rex Dieter <rdieter@fedoraproject.org> 4.3.3.1-7
-- rebuild (hdf)
-
-* Wed Sep 16 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.3.1-6
-- Rebuild for openmpi 1.10.0
-
-* Mon Aug 10 2015 Sandro Mani <manisandro@gmail.com> - 4.3.3.1-5
-- Rebuild for RPM MPI Requires Provides Change
-
-* Wed Jul 29 2015 Karsten Hopp <karsten@redhat.com> 4.3.3.1-4
-- mpich is available on ppc64 now
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.3.1-2
-- Rebuild for hdf5 1.8.15
-
 * Wed Mar 11 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.3.1-1
 - Update to 4.3.3.1
 

sources

@@ -1 +1 @@
-SHA512 (netcdf-4.7.0.tar.gz) = 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a
+5c9dad3705a3408d27f696e5b31fb88c  netcdf-4.3.3.1.tar.gz