[orsa/f18] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

[Deji Akingunola]

commit 3f3cc3ea7b430d25d066f922550f3bc3870260d7
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Wed Jul 24 08:57:34 2013 -0400

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

 orsa.spec |   71 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 39 insertions(+), 32 deletions(-)
---
diff --git a/orsa.spec b/orsa.spec
index 496c23f..179638e 100644
--- a/orsa.spec
+++ b/orsa.spec
@@ -3,7 +3,7 @@
 
 Name:			orsa
 Version:		0.7.0
-Release:		21%{?dist}
+Release:		22%{?dist}
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -79,27 +79,31 @@ Requires: %{name}-headers = %{version}-%{release}
 This package contains development files for a build of %{name}
  with support for OpenMPI.
 
-%package mpich2
-Summary:	A build of %{name} with support for MPICH2 MPI
+%package mpich
+Summary:	A build of %{name} with support for MPICH MPI
 Group:		Applications/Engineering
 
-BuildRequires:	mpich2-devel-static
+BuildRequires:	mpich-devel-static
 Requires:	%{name}-common = %{version}-%{release}
-Requires:	mpich2
+Requires:	mpich
+Provides:	%{name}-mpich2 = %{version}-%{release}
+Obsoletes:	%{name}-mpich2 < 0.7.0-22
 
-%description mpich2
-This package contains a build of %{name} with support for MPICH2 MPI.
+%description mpich
+This package contains a build of %{name} with support for MPICH MPI.
 
-%package mpich2-devel
-Summary:	Development files for %{name} build with support for MPICH2 MPI
+%package mpich-devel
+Summary:	Development files for %{name} build with support for MPICH MPI
 Group:		Development/Libraries
 
-Requires: %{name}-mpich2 = %{version}-%{release}
-Requires: %{name}-headers = %{version}-%{release}
+Requires:	%{name}-mpich = %{version}-%{release}
+Requires:	%{name}-headers = %{version}-%{release}
+Provides:	%{name}-mpich2-devel = %{version}-%{release}
+Obsoletes:	%{name}-mpich2-devel < 0.7.0-22
 
-%description mpich2-devel
+%description mpich-devel
 This package contains development files for a build of %{name}
-with support for MPICH2 MPI.
+with support for MPICH MPI.
 
 %package headers
 Summary:	Headers for development with %{name}
@@ -138,9 +142,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool ;\
 make %{?_smp_mflags} ; \
 cd ..
 
-%global OpenMPI_BIN %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_BIN)
-%global OpenMPI_LIB %(. /etc/profile.d/modules.sh; module load openmpi-%{_arch}; echo $MPI_LIB)
-%global mpich2dir %(. /etc/profile.d/modules.sh; module load mpich2-%{_arch}; echo $MPI_HOME)
+%global OpenMPI_BIN %(%{_openmpi_load} echo $MPI_BIN)
+%global OpenMPI_LIB %(%{_openmpi_load} echo $MPI_LIB)
+%global mpichdir %(%{_mpich_load} echo $MPI_HOME)
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
 ################################
@@ -158,16 +162,16 @@ export F77=mpif77
 echo -e "\n##############################\nNow making the OpenMPI version\n##############################\n"
 ################################
 
-module load openmpi-%{_arch}
+%{_openmpi_load}
 WITH_MPI=--with-mpi %dobuild
-module unload openmpi-%{_arch}
+%{_openmpi_unload}
 
 ################################
-echo -e "\n##############################\nNow making the MPICH2 version\n##############################\n"
+echo -e "\n##############################\nNow making the MPICH version\n##############################\n"
 ################################
-module load mpich2-%{_arch}
+%{_mpich_load}
 WITH_MPI=--with-mpi %dobuild
-module unload mpich2-%{_arch}
+%{_mpich_unload}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -178,16 +182,16 @@ make -C serial install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
 rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la,libxorsa.la}
 
 # Install OpenMPI version
-module load openmpi-%{_arch}
+%{_openmpi_load}
 make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
 rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
-module unload openmpi-%{_arch}
+%{_openmpi_unload}
 
-# Install MPICH2 version
-module load mpich2-%{_arch}
+# Install MPICH version
+%{_mpich_load}
 make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
 rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
-module unload mpich2-%{_arch}
+%{_mpich_unload}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -220,21 +224,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{OpenMPI_LIB}/*.so
 
-%files mpich2
+%files mpich
 %defattr(-,root,root,-)
-%{mpich2dir}/bin/*
-%{mpich2dir}/lib/liborsa.so.*
-%{mpich2dir}/lib/libxorsa.so.*
+%{mpichdir}/bin/*
+%{mpichdir}/lib/liborsa.so.*
+%{mpichdir}/lib/libxorsa.so.*
 
-%files mpich2-devel
+%files mpich-devel
 %defattr(-,root,root,-)
-%{mpich2dir}/lib/*.so
+%{mpichdir}/lib/*.so
 
 %files common
 %defattr(-,root,root,-)
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
+* Wed Jul 24 2013 Deji Akingunola <dakingun at gmail.com> - 0.7.0-22
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild