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

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12005

Modified Files:
	mpich2.spec 
Log Message:
* Tue May 04 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-3
- Fix multi-lib conflicts (BZ #577081)



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mpich2.spec	2 Mar 2010 06:20:43 -0000	1.23
+++ mpich2.spec	4 May 2010 18:07:04 -0000	1.24
@@ -3,7 +3,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1p1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -151,11 +151,11 @@ cp -pr src/packaging/envmods/mpich2.modu
 sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich2.sh
+cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich2-%{_arch}.sh
 # Load mpich2 environment module
 module load %{name}-%{_arch}
 EOF
-cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich2.{sh,csh}
+cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich2-%{_arch}.{sh,csh}
  
 # Install the RPM macro
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -219,7 +219,7 @@ fi
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
 %{_datadir}/Modules/modulefiles/%{name}-%{_arch}
-%{_sysconfdir}/profile.d/mpich2.*
+%{_sysconfdir}/profile.d/mpich2-%{_arch}.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -246,6 +246,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Tue May 04 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-3
+- Fix multi-lib conflicts (BZ #577081)
+
 * 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