[paraview/el6] Replace mpich2 with mpich for EL6.6 (bug #1155092)

[Orion Poplawski]

commit c871fbed012742150a88a1287a5155921c89a6eb
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Oct 21 11:28:34 2014 -0600

    Replace mpich2 with mpich for EL6.6 (bug #1155092)

 paraview.spec |   79 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index ceb1cae..2e7dcb8 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -1,8 +1,8 @@
 %{!?build_openmpi:%global build_openmpi 1}
 %ifnarch ppc64
-%{!?build_mpich2:%global build_mpich2 1}
+%{!?build_mpich:%global build_mpich 1}
 %else
-%{!?build_mpich2:%global build_mpich2 0}
+%{!?build_mpich:%global build_mpich 0}
 %endif
 %define pv_maj 3
 %define pv_min 8
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -39,8 +39,8 @@ BuildRequires:  cmake
 %if %{build_openmpi}
 BuildRequires:  openmpi-devel
 %endif
-%if %{build_mpich2}
-BuildRequires:  mpich2-devel
+%if %{build_mpich}
+BuildRequires:  mpich-devel
 %endif
 BuildRequires:  qt4-devel, mesa-libOSMesa-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
@@ -137,8 +137,8 @@ NOTE: The version in this package has NOT been compiled with MPI support.
 %if %{build_openmpi}
 Install the paraview-openmpi package to get a version compiled with openmpi.
 %endif
-%if %{build_mpich2}
-Install the paraview-mpich2 package to get a version compiled with mpich2.
+%if %{build_mpich}
+Install the paraview-mpich package to get a version compiled with mpich.
 %endif
 
 
@@ -158,18 +158,20 @@ OpenMPI.  These are named pvserver_openmpi, pvbatch_openmpi, etc.
 You will need to load the openmpi-%{arch} module to setup your path properly.
 %endif
 
-%if %{build_mpich2}
-%package        mpich2
+%if %{build_mpich}
+%package        mpich
 Summary:        Parallel visualization application
 Group:          Applications/Engineering
 Requires:       %{name}-data = %{version}-%{release}
-Requires:       mpich2
+Requires:       mpich
+Obsoletes:      %{name}-mpich2 < 3.8.1-3
+Provides:       %{name}-mpich2 = %{version}-%{release}
 
-%description    mpich2
+%description    mpich
 This package contains copies of the ParaView server binaries compiled with
-mpich2.  These are named pvserver_mpich2, pvbatch_mpich2, etc.
+mpich.  These are named pvserver_mpich, pvbatch_mpich, etc.
 
-You will need to load the mpich2-%{arch} module to setup your path properly.
+You will need to load the mpich-%{arch} module to setup your path properly.
 %endif
 
 
@@ -237,21 +239,21 @@ make VERBOSE=1 %{?_smp_mflags}
 %{_openmpi_unload}
 popd
 %endif
-%if %{build_mpich2}
-mkdir fedora-mpich2
-pushd fedora-mpich2
-%{_mpich2_load}
+%if %{build_mpich}
+mkdir fedora-mpich
+pushd fedora-mpich
+%{_mpich_load}
 %cmake .. \
-        -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/mpich2/bin \
-        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/mpich2/lib/paraview \
+        -DPV_INSTALL_BIN_DIR:PATH=%{_lib}/mpich/bin \
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/mpich/lib/paraview \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
-        -DMPI_COMPILER:FILEPATH=%{_libdir}/mpich2/bin/mpicxx \
+        -DMPI_COMPILER:FILEPATH=%{_libdir}/mpich/bin/mpicxx \
         %{paraview_cmake_options}
 # Fixup forward paths
-sed -i -e 's,../%{_lib}/mpich2,..,' `find -name \*-forward.c`
+sed -i -e 's,../%{_lib}/mpich,..,' `find -name \*-forward.c`
 make VERBOSE=1 %{?_smp_mflags}
-%{_mpich2_unload}
+%{_mpich_unload}
 popd
 %endif
 
@@ -292,19 +294,19 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}
 popd
 %endif
 
-%if %{build_mpich2}
-# Install mpich2 version
-pushd fedora-mpich2
+%if %{build_mpich}
+# Install mpich version
+pushd fedora-mpich
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Cleanup %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_libdir}/mpich2/bin
+pushd $RPM_BUILD_ROOT/%{_libdir}/mpich/bin
 #Don't need mpi versions of these
 rm paraview streaming_paraview lproj pvblot pvpython
 #Move the remaining mpi binaries out of the way
 for f in pvbatch pvdataserver pvrenderserver pvserver smTestDriver
 do
-   mv $f ${f}_mpich2
+   mv $f ${f}_mpich
 done
 popd
 
@@ -366,7 +368,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc License_v1.2.txt
 %{_bindir}/paraview
 %{_bindir}/pvbatch
@@ -382,7 +383,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %if %{build_openmpi}
 %files openmpi
-%defattr(-,root,root,-)
 %doc License_v1.2.txt
 %{_libdir}/openmpi/bin/pvbatch_openmpi
 %{_libdir}/openmpi/bin/pvdataserver_openmpi
@@ -393,27 +393,28 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 
-%if %{build_mpich2}
-%files mpich2
-%defattr(-,root,root,-)
+%if %{build_mpich}
+%files mpich
 %doc License_v1.2.txt
-%{_libdir}/mpich2/bin/pvbatch_mpich2
-%{_libdir}/mpich2/bin/pvdataserver_mpich2
-%{_libdir}/mpich2/bin/pvrenderserver_mpich2
-%{_libdir}/mpich2/bin/pvserver_mpich2
-%{_libdir}/mpich2/bin/smTestDriver_mpich2
-%{_libdir}/mpich2/lib/paraview
+%{_libdir}/mpich/bin/pvbatch_mpich
+%{_libdir}/mpich/bin/pvdataserver_mpich
+%{_libdir}/mpich/bin/pvrenderserver_mpich
+%{_libdir}/mpich/bin/pvserver_mpich
+%{_libdir}/mpich/bin/smTestDriver_mpich
+%{_libdir}/mpich/lib/paraview
 %endif
 
 
 %files data
-%defattr(-,root,root,-)
 %{_datadir}/applications/fedora-paraview.desktop
 %{_datadir}/pixmaps/paraview_22x22.png
 %{_datadir}/mime/packages/paraview.xml
 
 
 %changelog
+* Tue Oct 21 2014 Orion Poplawski <orion at cora.nwra.com> - 3.8.1-3
+- Replace mpich2 with mpich for EL6.6 (bug #1155092)
+
 * Mon Oct 31 2011 Orion Poplawski <orion at cora.nwra.com> - 3.8.1-2
 - Fixup forward paths for mpi versions (bug #748221)