rpms/mpich2/F-12 mpich2-modules.patch, 1.3, 1.4 mpich2.spec, 1.14, 1.15

Deji Akingunola deji at fedoraproject.org
Thu Nov 26 23:50:34 UTC 2009


Author: deji

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

Modified Files:
	mpich2-modules.patch mpich2.spec 
Log Message:
* Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-2
- Fix the mpich2.module patch.


mpich2-modules.patch:
 mpich2.module.in |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Index: mpich2-modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-12/mpich2-modules.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mpich2-modules.patch	18 Nov 2009 23:08:34 -0000	1.3
+++ mpich2-modules.patch	26 Nov 2009 23:50:33 -0000	1.4
@@ -1,32 +1,24 @@
 --- 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
-@@ -6,9 +6,29 @@
+@@ -4,11 +4,15 @@
+ # 
+ 
  # Define prefix so PATH and MANPATH can be updated.
- setenv        prefix        @prefix@
- setenv        exec_prefix   @exec_prefix@
-+setenv        MPI_BIN       @LIBDIR@/@MPILIBNAME@/bin
+-setenv        prefix        @prefix@
+-setenv        exec_prefix   @exec_prefix@
++setenv        MPI_BIN       @LIBDIR@/@MPILIBNAME at 2/bin
 +setenv        MPI_SYSCONFIG @sysconfdir@
 +setenv        MPI_FORTRAN_MOD_DIR @includedir@
 +setenv        MPI_INCLUDE   @includedir@
 +setenv        MPI_LIB       @libdir@
 +setenv        MPI_MAN       @mandir@
 +setenv        MPI_PYTHON_SITEARCH	@bindir@
-+setenv        MPI_COMPILER  @MPILIBNAME at -@ARCH@
-+setenv        MPI_SUFFIX    _ at MPILIBNAME@
-+setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME@
++setenv        MPI_COMPILER  @MPILIBNAME at 2-@ARCH@
++setenv        MPI_SUFFIX    _ at MPILIBNAME@2
++setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME at 2
  prepend-path  PATH          @bindir@
  prepend-path  MANPATH       @mandir@
- 
- # Undefine prefix and exec_prefix which are too generic environment variables.
- unsetenv      prefix
- unsetenv      exec_prefix
-+unsetenv      MPI_BIN
-+unsetenv      MPI_SYSCONFIG
-+unsetenv      MPI_FORTRAN_MOD_DIR
-+unsetenv      MPI_INCLUDE
-+unsetenv      MPI_LIB
-+unsetenv      MPI_MAN
-+unsetenv      MPI_PYTHON_SITEARCH
-+unsetenv      MPI_COMPILER
-+unsetenv      MPI_SUFFIX
-+unsetenv      MPI_HOME
+-
+-# Undefine prefix and exec_prefix which are too generic environment variables.
+-unsetenv      prefix
+-unsetenv      exec_prefix


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-12/mpich2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mpich2.spec	18 Nov 2009 23:08:34 -0000	1.14
+++ mpich2.spec	26 Nov 2009 23:50:34 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -321,6 +321,9 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-2
+- Fix the mpich2.module patch.
+
 * Wed Nov 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-1
 - Update to 1.2.1
 




More information about the fedora-extras-commits mailing list