[netcdf/f18] roll F-19 fixed back to F-18 to fix FTBFS on ARM (and likely latest x86)

[Peter Robinson]

commit 31ad2fbb02b6b0eec6f1fd952abc38125cddc2c9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Dec 7 08:41:33 2012 +0000

    roll F-19 fixed back to F-18 to fix FTBFS on ARM (and likely latest x86)

 netcdf.spec |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/netcdf.spec b/netcdf.spec
index eab3f13..cc85697 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.2.1.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -201,7 +201,7 @@ for mpi in %{mpi_list}
 do
   mkdir $mpi
   pushd $mpi
-  module load $mpi-%{_arch}
+  module load mpi/$mpi-%{_arch}
   ln -s ../configure .
   %configure %{configure_opts} \
     --libdir=%{_libdir}/$mpi/lib \
@@ -224,7 +224,7 @@ 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-%{_arch}
+  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}
@@ -235,12 +235,15 @@ done
 %check
 %ifnarch s390
 make -C build check
-for mpi in %{mpi_list}
-do
-  module load $mpi-%{_arch}
-  make -C $mpi check
-  module purge
-done
+# 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
+#  module purge
+#done
 %endif
 
 
@@ -317,6 +320,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Dec 03 2012 Orion Poplawski <orion at cora.nwra.com> - 4.2.1.1-3
+- Disable make check of the mpi code, it is hanging for some reason
+
+* Thu Nov 1 2012 Orion Poplawski <orion at cora.nwra.com> - 4.2.1.1-2
+- Use new mpi module location
+
 * Fri Aug 3 2012 Orion Poplawski <orion at cora.nwra.com> - 4.2.1.1-1
 - Update to 4.2.1.1