rpms/mpich2/devel mpich2.spec,1.22,1.23

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31871

Modified Files:
	mpich2.spec 
Log Message:
* Tue Mar 02 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-2
- Prevent the rpath link option from being included in the compiler wrappers



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mpich2.spec	1 Mar 2010 20:22:37 -0000	1.22
+++ mpich2.spec	2 Mar 2010 06:20:43 -0000	1.23
@@ -3,7 +3,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1p1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -17,7 +17,7 @@ BuildRequires:	emacs-common, perl, pytho
 Obsoletes:	%{name}-libs < 1.1.1
 Requires:	environment-modules
 Requires:	python
-Requires(pre):chkconfig
+Requires(pre):	chkconfig
 #Requires chkconfig for /usr/sbin/alternatives
 
 %description
@@ -42,7 +42,7 @@ Provides:	%{name}-devel-static = %{versi
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran 
-Requires(pre):chkconfig
+Requires(pre):	chkconfig
 #Requires chkconfig for /usr/sbin/alternatives
 
 %description devel
@@ -95,6 +95,11 @@ Contains documentations, examples and ma
 %patch0 -p0 -b .modu
 
 %build
+# Remove the rpath link options
+sed -i 's/C_LINKPATH_SHL=.*/C_LINKPATH_SHL=/' src/env/mpicc.bash.in
+sed -i 's/CXX_LINKPATH_SHL=.*/CXX_LINKPATH_SHL=/' src/env/mpicxx.bash.in
+sed -i 's/F90_LINKPATH_SHL=.*/F90_LINKPATH_SHL=/' src/env/mpif90.bash.in
+sed -i 's/FC_LINKPATH_SHL=.*/FC_LINKPATH_SHL=/' src/env/mpif77.bash.in
 %configure	\
 	--enable-sharedlibs=gcc					\
 	--enable-f90						\
@@ -241,6 +246,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Tue Mar 02 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-2
+- Prevent the rpath link option from being included in the compiler wrappers
+
 * Tue Feb 23 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1
 - Update to 1.2.1p1
 - Ship the mpi compilers in the main package