[mpich2/f18] Install module file in mpi subdirectory and conflict with other mpi modules Leave existing module fi

[Orion Poplawski]

commit edcb88abc624c7d7307839ed31498cd3e6b23092
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Oct 31 22:26:31 2012 -0600

    Install module file in mpi subdirectory and conflict with other mpi modules
    Leave existing module file location for backwards compatibility for a while

 mpich2-modules.patch |   11 ++++++++---
 mpich2.spec          |   14 ++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/mpich2-modules.patch b/mpich2-modules.patch
index 5c5c324..328e11f 100644
--- a/mpich2-modules.patch
+++ b/mpich2-modules.patch
@@ -1,8 +1,13 @@
---- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
-+++ src/packaging/envmods/mpich2.module.in.new	2010-09-22 14:27:49.950096538 -0400
-@@ -4,11 +4,17 @@
+diff -up src/packaging/envmods/mpich2.module.in.modu src/packaging/envmods/mpich2.module.in
+--- src/packaging/envmods/mpich2.module.in.modu	2009-07-02 13:54:58.000000000 -0600
++++ src/packaging/envmods/mpich2.module.in	2012-10-31 22:17:20.232008834 -0600
+@@ -3,12 +3,21 @@
+ #  MPICH2 module for use with 'environment-modules' package:
  # 
  
++# Only allow one mpi module to be loaded at a time
++conflict mpi
++
  # Define prefix so PATH and MANPATH can be updated.
 -setenv        prefix        @prefix@
 -setenv        exec_prefix   @exec_prefix@
diff --git a/mpich2.spec b/mpich2.spec
index 4229da6..4337fe0 100644
--- a/mpich2.spec
+++ b/mpich2.spec
@@ -3,7 +3,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.4.1p1
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -178,15 +178,16 @@ chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 #mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
 # Install the module file
-mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
 mkdir -p %{buildroot}%{python_sitearch}/%{name}
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
 sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
+cp -p %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch} %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich2-%{_arch}.sh
 # Load mpich2 environment module
-module load %{name}-%{_arch}
+module load mpi/%{name}-%{_arch}
 EOF
 cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich2-%{_arch}.{sh,csh}
  
@@ -245,6 +246,7 @@ fi
 %dir %{python_sitearch}/%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
+%{_sysconfdir}/modulefiles/mpi/
 %{_sysconfdir}/modulefiles/%{name}-%{_arch}
 %exclude %{_libdir}/%{name}/bin/*log*
 %exclude %{_libdir}/%{name}/bin/jumpshot
@@ -278,6 +280,10 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Wed Oct 31 2012 Orion Poplawski <orion at cora.nwra.com> - 1.4.1p1-9
+- Install module file in mpi subdirectory and conflict with other mpi modules
+- Leave existing module file location for backwards compatibility for a while
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1p1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild