[paraview] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

[Deji Akingunola]

commit e1b2295a33957a0ebb328f3203bbf6100df798a1
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Sun Jul 21 18:54:38 2013 -0400

    Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

 paraview.spec |   85 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 46 insertions(+), 39 deletions(-)
---
diff --git a/paraview.spec b/paraview.spec
index 2253c21..6550704 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -2,7 +2,7 @@
 %global build_openmpi 0
 %endif
 %{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich2:%global build_mpich2 1}
+%{!?build_mpich:%global build_mpich 1}
 %global pv_maj 3
 %global pv_min 98
 %global pv_patch 1
@@ -13,7 +13,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -41,9 +41,9 @@ BuildRequires:  cmake
 BuildRequires:  openmpi-devel
 BuildRequires:  netcdf-openmpi-devel
 %endif
-%if %{build_mpich2}
-BuildRequires:  mpich2-devel
-BuildRequires:  netcdf-mpich2-devel
+%if %{build_mpich}
+BuildRequires:  mpich-devel
+BuildRequires:  netcdf-mpich-devel
 %endif
 BuildRequires:  qt-devel
 BuildRequires:  qt-assistant-adp-devel
@@ -131,8 +131,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
 
 
@@ -192,28 +192,32 @@ The %{name}-openmpi-devel package contains libraries and header files for
 developing applications that use %{name}-openmpi.
 %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
+Provides:	%{name}-mpich2 = %{version}-%{release}
+Obsoletes:	%{name}-mpich2 < 3.98.1-6
 
-%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.
 
 
-%package        mpich2-devel
-Summary:        Development files for %{name}-mpich2
+%package        mpich-devel
+Summary:        Development files for %{name}-mpich
 Group:          Development/Libraries
-Requires:       %{name}-mpich2%{?_isa} = %{version}-%{release}
+Requires:       %{name}-mpich%{?_isa} = %{version}-%{release}
+Provides:	%{name}-mpich2-devel = %{version}-%{release}
+Obsoletes:	%{name}-mpich2-devel < 3.98.1-6
 
-%description    mpich2-devel
-The %{name}-mpich2-devel package contains libraries and header files for
-developing applications that use %{name}-mpich2.
+%description    mpich-devel
+The %{name}-mpich-devel package contains libraries and header files for
+developing applications that use %{name}-mpich.
 %endif
 
 
@@ -271,24 +275,24 @@ 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 .. \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/mpich2 \
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/mpich \
         -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
         -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \
         -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \
         -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
         -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
 
@@ -316,13 +320,13 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man}
 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
 
 #Remove mpi copy of doc and man pages
-rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich2/share/{doc,man}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich/share/{doc,man}
 popd
 %endif
 
@@ -424,20 +428,23 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 
-%if %{build_mpich2}
-%files mpich2
+%if %{build_mpich}
+%files mpich
 %doc License_v1.2.txt
-%{_libdir}/mpich2/bin/[ps]*
-%{_libdir}/mpich2/lib/paraview/
+%{_libdir}/mpich/bin/[ps]*
+%{_libdir}/mpich/lib/paraview/
 
-%files mpich2-devel
-%{_libdir}/mpich2/bin/vtk*
-%{_libdir}/mpich2/include/paraview/
-%{_libdir}/mpich2/share/cmake/
+%files mpich-devel
+%{_libdir}/mpich/bin/vtk*
+%{_libdir}/mpich/include/paraview/
+%{_libdir}/mpich/share/cmake/
 %endif
 
 
 %changelog
+* Sat Jul 20 2013 Deji Akingunola <dakingun at gmail.com> - 3.98.1-6
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 3.98.1-5
 - Rebuild for hdf5 1.8.11