rpms/orsa/F-12 orsa.spec,1.12,1.13

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/orsa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432

Modified Files:
	orsa.spec 
Log Message:
* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-11.1
- Rebuild for mpich2 and BR mpich2-devel-static
- Update the spec for changes in mpich2 packaging



Index: orsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-12/orsa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- orsa.spec	27 Aug 2009 14:41:39 -0000	1.12
+++ orsa.spec	10 Dec 2009 18:00:57 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:			orsa
 Version:		0.7.0
-Release:		11%{?dist}
+Release:		11%{?dist}.1
 Summary:		Orbit Reconstruction, Simulation and Analysis
 
 Group:			Amusements/Graphics
@@ -83,7 +83,7 @@ This package contains development files 
 Summary:	A build of %{name} with support for MPICH2 MPI
 Group:		Applications/Engineering
 
-BuildRequires: mpich2-devel
+BuildRequires: mpich2-devel-static
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	mpich2
 
@@ -164,9 +164,9 @@ cd ..
 . /etc/profile.d/modules.sh
 %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 LAM_BIN %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_BIN | sed 's|-L||')
 %global LAM_LIB %(. /etc/profile.d/modules.sh; module load lam-%{_arch}; echo $MPI_LIB | sed 's|-L||')
-%global MPICH_BIN %(. /etc/profile.d/modules.sh; module load mpich2.module; echo $PATH | cut -f 1 -d :)
 
 ################################
 echo -e "\n##############################\nNow making the non-MPI version\n##############################\n"
@@ -186,15 +186,15 @@ echo -e "\n#############################
 ################################
 
 module load openmpi-%{_arch}
-MPI_COMPILER=openmpi MPI_SUFFIX=_openmpi WITH_MPI=--with-mpi %dobuild
+WITH_MPI=--with-mpi %dobuild
 module unload openmpi-%{_arch}
 
 ################################
 echo -e "\n##############################\nNow making the MPICH2 version\n##############################\n"
 ################################
-module load mpich2.module
-MPI_COMPILER=mpich2 MPI_BIN=%{MPICH_BIN} MPI_LIB=%{_libdir}/mpich2/ MPICXX=mpicxx MPI_SUFFIX=_mpich2 CC=mpicxx WITH_MPI=--with-mpi %dobuild
-module unload mpich2.module
+module load mpich2-%{_arch}
+WITH_MPI=--with-mpi %dobuild
+module unload mpich2-%{_arch}
 
 ################################
 echo -e "\n##############################\nNow making the LAM version\n##############################\n"
@@ -220,17 +220,15 @@ rm $RPM_BUILD_ROOT%{_libdir}/{liborsa.la
 
 # Install OpenMPI version
 module load openmpi-%{_arch}
-MPI_COMPILER=openmpi
 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}
 
 # Install MPICH2 version
-module load mpich2.module
-MPI_COMPILER=mpich2
+module load mpich2-%{_arch}
 make -C $MPI_COMPILER install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
-rm $RPM_BUILD_ROOT%{_libdir}/mpich2/{liborsa.la,libxorsa.la}
-module unload mpich2.module
+rm $RPM_BUILD_ROOT$MPI_LIB/{liborsa.la,libxorsa.la}
+module unload mpich2-%{_arch}
 
 # Install LAM version
 module load lam-%{_arch}
@@ -273,13 +271,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files mpich2
 %defattr(-,root,root,-)
-%{MPICH_BIN}/*
-%{_libdir}/mpich2/liborsa.so.*
-%{_libdir}/mpich2/libxorsa.so.*
+%{mpich2dir}/bin/*
+%{mpich2dir}/lib/liborsa.so.*
+%{mpich2dir}/lib/libxorsa.so.*
 
 %files mpich2-devel
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/*.so
+%{mpich2dir}/lib/*.so
 
 %files lam
 %defattr(-,root,root,-)
@@ -296,6 +294,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING DEVELOPERS ORSA_MPI
 
 %changelog
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 0.7.0-11.1
+- Rebuild for mpich2 and BR mpich2-devel-static
+- Update the spec for changes in mpich2 packaging
+
 * Thu Aug 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-11
 - Make compliant to new MPI guidelines:
 - Do not build in %%install (resolves BZ#513697)