[orsa] - Rebuilt for new mpich2 - Use %%{_*mpi*-_load/unload} macros

[Miloš Jakubíček]

commit afb6585715ecd3833c5e808e5b7a213fda3660ea
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sun Nov 4 18:40:46 2012 +0100

    - Rebuilt for new mpich2
    - Use %%{_*mpi*-_load/unload} macros

 orsa.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/orsa.spec b/orsa.spec
index 496c23f..a684ae8 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
@@ -138,9 +138,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 mpich2dir %(%{_mpich2_load} echo $MPI_HOME)
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
 ################################
@@ -158,16 +158,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"
 ################################
-module load mpich2-%{_arch}
+%{_mpich2_load}
 WITH_MPI=--with-mpi %dobuild
-module unload mpich2-%{_arch}
+%{_mpich2_unload}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -178,16 +178,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}
+%{_mpich2_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}
+%{_mpich2_unload}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -235,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
+* Sun Nov 04 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 0.7.0-22
+- Rebuilt for new mpich2
+- Use %%{_*mpi*-_load/unload} macros
+
 * 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