Add ARM to valgrind excludes

2011-08-11 17:31:33 +01:00
6 changed files with 145 additions and 494 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,20 +1 @@
 netcdf-4.1.1.tar.gz
-/netcdf-4.1.2.tar.gz
-/netcdf-4.1.3.tar.gz
-/netcdf-4.2-rc1.tar.gz
-/netcdf-4.2-rc2.tar.gz
-/netcdf-4.2.tar.gz
-/netcdf-4.2.1-rc1.tar.gz
-/netcdf-4.2.1.tar.gz
-/netcdf-4.2.1.1.tar.gz
-/netcdf-4.3.0.tar.gz
-/v4.3.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
--- a/netcdf-4.1-beta2-pkgconfig.patch
+++ b/netcdf-4.1-beta2-pkgconfig.patch
@ -0,0 +1,34 @@
+diff -up netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig netcdf-4.1-snapshot2010020100/nc-config.in
+--- netcdf-4.1-snapshot2010020100/nc-config.in.pkgconfig	2010-01-11 12:27:12.000000000 -0700
+++ netcdf-4.1-snapshot2010020100/nc-config.in	2010-02-01 16:04:22.429448744 -0700
+@@ -8,7 +8,6 @@
+ 
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+ 
+ cc="@CC@"
+@@ -16,8 +15,6 @@ cxx="@CXX@"
+ fc="@FC@"
+ cflags=" -I${includedir}"
+ fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
+-libs="-L${libdir} @NC_LIBS@"
+-flibs="-L${libdir} @NC_FLIBS@"
+ has_dap="@HAS_DAP@"
+ has_nc2="@HAS_NC2@"
+ has_nc4="@HAS_NC4@"
+@@ -138,11 +135,11 @@ while test $# -gt 0; do
+ 	;;
+ 
+      --libs)
+-       	echo $libs
+       	pkg-config netcdf --libs
+        	;;
+ 
+     --flibs)
+-       	echo $flibs
+       	pkg-config netcdf --flibs
+        	;;
+ 
+     --has-dap)
--- a/netcdf-4.1.1-fflags.patch
+++ b/netcdf-4.1.1-fflags.patch
@ -0,0 +1,13 @@
+--- netcdf-4.1.1/nc-config.in.fflags	2010-04-08 14:05:40.063132547 -0600
+++ netcdf-4.1.1/nc-config.in	2010-04-09 13:53:26.923928260 -0600
+@@ -13,8 +13,8 @@
+ cc="@CC@"
+ cxx="@CXX@"
+ fc="@FC@"
+-cflags=" -I${includedir}"
+-fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
+cflags="-I${includedir}"
+fflags="@MOD_FLAG@${includedir}"
+ has_dap="@HAS_DAP@"
+ has_nc2="@HAS_NC2@"
+ has_nc4="@HAS_NC4@"
--- a/netcdf-4.1.1-hdf5.patch
+++ b/netcdf-4.1.1-hdf5.patch
@ -0,0 +1,12 @@
+diff -up netcdf-4.1.1/libsrc4/Makefile.in.hdf5 netcdf-4.1.1/libsrc4/Makefile.in
+--- netcdf-4.1.1/libsrc4/Makefile.in.hdf5	2010-04-19 09:44:45.333650779 -0600
+++ netcdf-4.1.1/libsrc4/Makefile.in	2010-04-19 09:44:45.338649501 -0600
+@@ -886,7 +886,7 @@ clean-libLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES) 
+-	$(libnetcdf_la_LINK) -rpath $(libdir) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) $(LIBS)
+	$(libnetcdf_la_LINK) -rpath $(libdir) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) -lhdf5_hl -lhdf5 $(LIBS)
+ 
+ clean-checkPROGRAMS:
+ 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
--- a/netcdf.spec
+++ b/netcdf.spec
@ -1,46 +1,43 @@
 Name:           netcdf
-Version:        4.7.0
-Release:        2%{?dist}
+Version:        4.1.1
+Release:        6%{?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
+Source0:        http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-4.1.1.tar.gz
+#Use pkgconfig in nc-config to avoid multi-lib issues
+Patch0:         netcdf-4.1-beta2-pkgconfig.patch
+Patch1:         netcdf-4.1.1-fflags.patch
+#Explicitly link libnetcdf.so agains -lhdf5_hl -lhdf5, reported upstream
+Patch2:         netcdf-4.1.1-hdf5.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-BuildRequires:  libtool
-BuildRequires:  chrpath
-BuildRequires:  doxygen
-BuildRequires:  hdf-static
-BuildRequires:  hdf5-devel
-BuildRequires:  gawk
+BuildRequires:  gcc-gfortran, gawk
+BuildRequires:  hdf5-devel >= 1.8.4
 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
-#https://trac.mcs.anl.gov/projects/mpich2/ticket/1576
-BuildRequires:  openssh-clients
-Requires:       hdf5%{?_isa} = %{_hdf5_version}

-%global with_mpich 1
-%global with_openmpi 1
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%ifarch ppc64
-# No mpich on ppc64 in EL6
-%global with_mpich 0
-%endif
-%endif
+%package devel
+Summary:        Development files for netcdf
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}
+Requires:       pkgconfig
+Requires:       hdf5-devel
+Requires:       libcurl-devel

-%if %{with_mpich}
-%global mpi_list mpich
-%endif
-%if %{with_openmpi}
-%global mpi_list %{?mpi_list} openmpi
-%endif
+%package static
+Summary:        Static libs for netcdf
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}

 %description
+
 NetCDF (network Common Data Form) is an interface for array-oriented 
 data access and a freely-distributed collection of software libraries 
 for C, Fortran, C++, and perl that provides an implementation of the 
@ -71,492 +68,106 @@ NetCDF data is:
   o Sharable:  One writer and multiple readers may simultaneously
     access the same NetCDF file.

-
-%package devel
-Summary:        Development files for netcdf
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       pkgconfig%{?_isa}
-Requires:       hdf5-devel%{?_isa}
-Requires:       libcurl-devel%{?_isa}
-
 %description devel
-This package contains the netCDF C header files, shared devel libs, and 
+This package contains the netCDF header files, shared devel libs, and 
 man pages.

-
-%package static
-Summary:        Static libs for netcdf
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
 %description static
-This package contains the netCDF C static libs.
-
-
-%if %{with_mpich}
-%package mpich
-Summary: NetCDF mpich libraries
-Requires: hdf5-mpich%{?_isa} = %{_hdf5_version}
-BuildRequires: mpich-devel
-BuildRequires: hdf5-mpich-devel >= 1.8.4
-Provides: %{name}-mpich2 = %{version}-%{release}
-Obsoletes: %{name}-mpich2 < 4.3.0-4
-
-%description mpich
-NetCDF parallel mpich libraries
-
-
-%package mpich-devel
-Summary: NetCDF mpich development files
-Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
-Requires: pkgconfig%{?_isa}
-Requires: hdf5-mpich-devel%{?_isa}
-Requires: libcurl-devel%{?_isa}
-Provides: %{name}-mpich2-devel = %{version}-%{release}
-Obsoletes: %{name}-mpich2-devel < 4.3.0-4
-
-%description mpich-devel
-NetCDF parallel mpich development files
-
-
-%package mpich-static
-Summary: NetCDF mpich static libraries
-Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
-Provides: %{name}-mpich2-static = %{version}-%{release}
-Obsoletes: %{name}-mpich2-static < 4.3.0-4
-
-%description mpich-static
-NetCDF parallel mpich static libraries
-%endif
-
-
-%if %{with_openmpi}
-%package openmpi
-Summary: NetCDF openmpi libraries
-Requires: hdf5-openmpi%{?_isa} = %{_hdf5_version}
-BuildRequires: openmpi-devel
-BuildRequires: hdf5-openmpi-devel >= 1.8.4
-
-%description openmpi
-NetCDF parallel openmpi libraries
-
-
-%package openmpi-devel
-Summary: NetCDF openmpi development files
-Requires: %{name}-openmpi%{_isa} = %{version}-%{release}
-Requires: openmpi-devel%{?_isa}
-Requires: pkgconfig%{?_isa}
-Requires: hdf5-openmpi-devel%{?_isa}
-Requires: libcurl-devel%{?_isa}
-
-%description openmpi-devel
-NetCDF parallel openmpi development files
-
-
-%package openmpi-static
-Summary: NetCDF openmpi static libraries
-Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release}
-
-%description openmpi-static
-NetCDF parallel openmpi static libraries
-%endif
+This package contains the netCDF static libs.


 %prep
-%autosetup -p1 -n %{name}-c-%{version}
+%setup -q
+%patch0 -p1 -b .pkgconfig
+%patch1 -p1 -b .fflags
+%patch2 -p1 -b .hdf5


 %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" \\\
-           --enable-hdf4 \\\
-           --disable-dap-remote-tests \\\
-%{nil}
+export F77="gfortran"
+export FC="gfortran"
+export FFLAGS="${RPM_OPT_FLAGS}"
+export FCFLAGS="$FFLAGS"
+%configure \
+           --enable-shared \
+           --enable-netcdf-4 \
+           --enable-dap \
+           --enable-ncgen4 \
+           --enable-extra-example-tests \
+%ifnarch s390 s390x
+           --enable-valgrind-tests \
+%endif
+           --disable-dap-remote-tests
+#Need to be able to properly list all hdf4 library deps and location
+#           --enable-hdf4 \

-# Serial build
-mkdir build
-pushd build
-ln -s ../configure .
-%configure %{configure_opts}
-%make_build
-popd
-
-# MPI builds
-export CC=mpicc
-for mpi in %{mpi_list}
-do
-  mkdir $mpi
-  pushd $mpi
-  module load mpi/$mpi-%{_arch}
-  ln -s ../configure .
-  # parallel tests hang on s390(x)
-  %configure %{configure_opts} \
-    --libdir=%{_libdir}/$mpi/lib \
-    --bindir=%{_libdir}/$mpi/bin \
-    --sbindir=%{_libdir}/$mpi/sbin \
-    --includedir=%{_includedir}/$mpi-%{_arch} \
-    --datarootdir=%{_libdir}/$mpi/share \
-    --mandir=%{_libdir}/$mpi/share/man \
-    --enable-parallel-tests
-  %make_build
-  module purge
-  popd
-done
+make #%{?_smp_mflags}


 %install
-make -C build install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT}
+mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
+/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod  \
+  ${RPM_BUILD_ROOT}%{_fmoddir}
 /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
-chrpath --delete ${RPM_BUILD_ROOT}/%{_bindir}/nc{copy,dump,gen,gen3}
 /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-for mpi in %{mpi_list}
-do
-  module load mpi/$mpi-%{_arch}
-  make -C $mpi install DESTDIR=${RPM_BUILD_ROOT}
-  rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
-  chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3}
-  module purge
-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
-for mpi in %{mpi_list}
-do
-  module load mpi/$mpi-%{_arch}
-  make -C $mpi check || ( cat $mpi/*/test-suite.log && exit $fail )
-  module purge
-done
+make check


-%ldconfig_scriptlets
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+
+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/netcdf.info \
+    %{_infodir}/dir 2>/dev/null || :
+
+%postun
+/sbin/ldconfig
+if [ "$1" = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/netcdf.info \
+    %{_infodir}/dir 2>/dev/null || :
+fi


 %files
-%license COPYRIGHT
-%doc README.md RELEASE_NOTES.md
+%defattr(-,root,root,-)
+%doc COPYRIGHT README
 %{_bindir}/nccopy
 %{_bindir}/ncdump
 %{_bindir}/ncgen
 %{_bindir}/ncgen3
-%{_libdir}/*.so.15*
+%{_libdir}/*.so.*
 %{_mandir}/man1/*
+%{_datadir}/doc/netcdf
+%{_infodir}/*

 %files devel
-%doc examples
+%defattr(-,root,root,-)
 %{_bindir}/nc-config
+%{_includedir}/ncvalues.h
 %{_includedir}/netcdf.h
-%{_includedir}/netcdf_aux.h
-%{_includedir}/netcdf_filter.h
-%{_includedir}/netcdf_meta.h
-%{_includedir}/netcdf_mem.h
-%{_libdir}/libnetcdf.settings
+%{_includedir}/netcdf.hh
+%{_includedir}/netcdf.inc
+%{_includedir}/netcdfcpp.h
+%{_fmoddir}/*.mod
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/netcdf.pc
 %{_mandir}/man3/*

 %files static
+%defattr(-,root,root,-)
 %{_libdir}/*.a

-%if %{with_mpich}
-%files mpich
-%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.15*
-%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
-%{_libdir}/mpich/lib/libnetcdf.settings
-%{_libdir}/mpich/lib/*.so
-%{_libdir}/mpich/lib/pkgconfig/%{name}.pc
-%doc %{_libdir}/mpich/share/man/man3/*.3*
-
-%files mpich-static
-%{_libdir}/mpich/lib/*.a
-%endif
-
-%if %{with_openmpi}
-%files openmpi
-%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.15*
-%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
-%{_libdir}/openmpi/lib/libnetcdf.settings
-%{_libdir}/openmpi/lib/*.so
-%{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
-%doc %{_libdir}/openmpi/share/man/man3/*.3*
-
-%files openmpi-static
-%{_libdir}/openmpi/lib/*.a
-%endif
-

 %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
-
-* Fri Feb 13 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.3-1
- Update to 4.3.3
-
-* Tue Jan 27 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-7
- Fix up provides/requires for mpi packages, use %%{?_isa}.
-
-* Wed Jan 07 2015 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-6
- Rebuild for hdf5 1.8.14
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jul 24 2014 Jakub Čajka <jcajka@redhat.com> - 4.3.2-4
- Enabled tests on s390
- Disabled parallel tests on s390(x) as they hang
-
-* Mon Jun 9 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-3
- Rebuild for hdf5 1.8.13, add patch for support
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Apr 23 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-1
- Update to 4.3.2
- Drop utf8 patch fixed upstream
- Re-enable MPI tests
-
-* Fri Mar 7 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.1.1-3
- Strip UTF-8 character from netcdf.h for now, causes problems with
-  netcdf4-python build
-
-* Sat Feb 22 2014 Deji Akingunola <dakingun@gmail.com> - 4.3.1.1-2
- Rebuild for mpich-3.1
-
-* Thu Feb 6 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.1.1-1
- Update to 4.3.1.1
- Add BR m4
-
-* Fri Dec 27 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-8
- Rebuild for hdf5 1.8.12
-
-* Thu Dec 5 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-7
- Use BR hdf-static (bug #1038280)
-
-* Mon Nov 4 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-6
- Enable hdf4 support
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Jul 20 2013 Deji Akingunola <dakingun@gmail.com> - 4.3.0-4
- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
-
-* Thu Jul 11 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-3
- Rebuild for openmpi 1.7.2
-
-* Thu May 16 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-2
- Rebuild for hdf5 1.8.11
-
-* Mon May 13 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-1
- Update to 4.3.0
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Dec 03 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-3
- Rebuild for hdf5 1.8.10
- Disable make check of the mpi code, it is hanging for some reason
-
-* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-2
- Rebuild for openmpi and mpich2 soname bumps
- Use new mpi module location
-
-* Fri Aug 3 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-1
- Update to 4.2.1.1
-
-* Sun Jul 22 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1-1
- Update to 4.2.1 final
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-0.2.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Jul 11 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1-0.1.rc1
- Update to 4.2.1 rc1
- Rebase pkgconfig patch
- Drop fflags patch, upstream now calls nf-config
-
-* Wed Jun 13 2012 Dan Horák <dan[at]danny.cz> - 4.2-5
- temporarily disable checks on s390 (memory corruption and stuck build)
-
-* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-4
- Rebuild with hdf5 1.8.9
-
-* Wed Mar 21 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-3
- Update to real 4.2 final
-
-* Tue Mar 20 2012 Dan Horák <dan[at]danny.cz> - 4.2-2
- use %%{mpi_list} also in %%check
-
-* Fri Mar 16 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-1
- Update to 4.2 final
-
-* Wed Mar 7 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-0.4.rc2
- Ship examples with -devel
-
-* Wed Mar 7 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-0.3.rc2
- Enable MPI builds
-
-* Tue Mar 6 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2-0.2.rc2
- Update to 4.2-rc2
- Fortran and C++ APIs are now in separate packages
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.3-5
- Rebuilt for c++ ABI breakage
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Nov 18 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-3
- Rebuild for hdf5 1.8.8, add explicit requires
-
-* Thu Aug 11 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 4.1.3-2
+* Thu Aug 11 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 4.1.1-6
 - Add ARM to valgrind excludes

-* Tue Jun 21 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-1
- Update to 4.1.3
- Update pkgconfig and fflags patches
- Drop libm patch fixed upstream
-
-* Tue May 17 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.2-2
- Rebuild for hdf5 1.8.7
-
-* Thu Mar 31 2011 Orion Poplawski <orion@cora.nwra.com> - 4.1.2-1
- Update to 4.1.2 (soname bump)
- Add patch to add -lm to libnetcdf4
-
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

@ -685,10 +296,10 @@ done
 - building the library twice (once each for g77 and gfortran) 
  fixes an annoying problem for people who need both compilers

-* Fri Sep 30 2005 Ed Hill <ed@eh3.com> - 3.6.0-7.p1
+* Fri Sep 29 2005 Ed Hill <ed@eh3.com> - 3.6.0-7.p1
 - add FFLAGS="-fPIC"

-* Fri Jun 10 2005 Ed Hill <ed@eh3.com> - 3.6.0-6.p1
+* Fri Jun 13 2005 Ed Hill <ed@eh3.com> - 3.6.0-6.p1
 - rebuild

 * Fri Jun  3 2005 Ed Hill <ed@eh3.com> - 3.6.0-5.p1
@ -697,7 +308,7 @@ done
 * Mon May  9 2005 Ed Hill <ed@eh3.com> - 3.6.0-4.p1
 - remove hard-coded dist/fedora macros

-* Wed May  4 2005 Ed Hill <ed@eh3.com> - 3.6.0-3.p1
+* Wed May  5 2005 Ed Hill <ed@eh3.com> - 3.6.0-3.p1
 - make netcdf-devel require netcdf (bug #156748)
 - cleanup environment and paths

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (netcdf-4.7.0.tar.gz) = 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a
+99cb93a15c4687cb7983e794f4f0ea9e  netcdf-4.1.1.tar.gz