[mpich2/el5/master] * Mon Aug 16 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1 - Upgrade to 1.2.1p1. - Fix the p

[Deji Akingunola]

commit 9fd7afd065698b31c1516b86ceec5fbec037fbe8
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Wed Aug 18 10:31:03 2010 -0400

    * Mon Aug 16 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1
    - Upgrade to 1.2.1p1.
    - Fix the post-install scriptlet error causing build issue (BZ 624217)

 mpich2-modules.patch |    3 ++-
 mpich2.spec          |   22 +++++++++++++++-------
 sources              |    2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/mpich2-modules.patch b/mpich2-modules.patch
index 09a0523..25ec830 100644
--- a/mpich2-modules.patch
+++ b/mpich2-modules.patch
@@ -1,6 +1,6 @@
 --- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
 +++ src/packaging/envmods/mpich2.module.in.new	2009-11-09 10:37:03.524042574 -0500
-@@ -4,11 +4,15 @@
+@@ -4,11 +4,16 @@
  # 
  
  # Define prefix so PATH and MANPATH can be updated.
@@ -17,6 +17,7 @@
 +setenv        MPI_SUFFIX    _ at MPILIBNAME@2
 +setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME at 2
  prepend-path  PATH          @bindir@
++prepend-path  LD_LIBRARY_PATH @libdir@
  prepend-path  MANPATH       @mandir@
 -
 -# Undefine prefix and exec_prefix which are too generic environment variables.
diff --git a/mpich2.spec b/mpich2.spec
index 3b06d4d..f83f997 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.2.1
-Release:	3%{?dist}
+Version:	1.2.1p1
+Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -239,6 +239,14 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%pre devel
+if [ $1 -gt 1 ] ; then
+# Remove the old alternative
+	if [ -e %{_bindir}/mp%{mbits}-mpicc ] ; then
+	/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mbits}-mpicc
+	fi
+fi
+
 %post devel
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
@@ -248,10 +256,6 @@ if [ $1 -eq 1 ] ; then
 	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
 	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
 fi
-# Remove the old alternative
-if [ $1 -gt 1 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mbits}-mpicc
-fi
 
 %posttrans devel
 if [ $1 -eq 0 ] ; then
@@ -282,7 +286,6 @@ fi
 %{_libdir}/%{name}/bin/mpirun
 %{_libdir}/%{name}/bin/mpich2version
 %config %{_sysconfdir}/%{name}-%{_arch}/
-%config %{_sysconfdir}/rpm/macros.%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
 %{_datadir}/Modules/modulefiles/%{name}-%{_arch}
@@ -314,6 +317,7 @@ fi
 %{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
 %{_datadir}/%{name}/examples*/Makefile-%{_arch}
+%config %{_sysconfdir}/rpm/macros.%{name}
 
 %files doc
 %defattr(-,root,root,-)
@@ -326,6 +330,10 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Mon Aug 16 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1p1-1
+- Upgrade to 1.2.1p1.
+- Fix the post-install scriptlet error causing build issue (BZ 624217) 
+
 * Thu Feb 04 2010 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
 - Replace __isa_bits macro in the post-script (macros not in RHEL5 rpm).
 
diff --git a/sources b/sources
index 413ff18..3073fc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0956a85fc7de2305eeb7cdd12742d9e9  mpich2-1.2.1.tar.gz
+fa7e8dc7c5fb60395ab26c5b239321ca  mpich2-1.2.1p1.tar.gz