[mpich2/f15] Comply to MPI guidelines (BZ #647147).

[Jussi Lehtola]

commit 8a57900b34a779263b39df696304badb0cb2a94a
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Jan 2 16:34:57 2012 +0200

    Comply to MPI guidelines (BZ #647147).

 mpich2.spec |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/mpich2.spec b/mpich2.spec
index 637db39..49f62b7 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:	2%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -40,6 +40,19 @@ shared-memory and TCP/IP sockets based communication.
 
 This build also include support for using the 'module environment' to select
 which MPI implementation to use when multiple implementations are installed.
+If you want MPICH2 support to be automatically loaded, you need to install the
+mpich2-autoload package.
+
+%package autoload
+Summary:	Load mpich2 automatically into profile
+Group:		System Environment/Base
+Requires:	mpich2 = %{version}-%{release}
+# Branched at 1.4.1p1-3 (but f16 branch got -2 bumped to -3),
+# this makes the transition smooth.
+Obsoletes:	mpich2 < 1.4.1p1-4
+
+%description autoload
+This package contains profile files that make mpich2 automatically loaded.
 
 %package devel
 Summary:	Development files for mpich2
@@ -56,8 +69,8 @@ Contains development headers and libraries for mpich2
 
 %package doc
 Summary:	Documentations and examples for mpich2
-Group:          Documentation
-BuildArch:      noarch
+Group:		Documentation
+BuildArch:	noarch
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description doc
@@ -236,10 +249,13 @@ fi
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
 %{_sysconfdir}/modulefiles/%{name}-%{_arch}
-%{_sysconfdir}/profile.d/mpich2-%{_arch}.*
 %exclude %{_libdir}/%{name}/bin/*log*
 %exclude %{_libdir}/%{name}/bin/jumpshot
 
+%files autoload
+%defattr(-,root,root,-)
+%{_sysconfdir}/profile.d/mpich2-%{_arch}.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/bin/*log*
@@ -265,8 +281,15 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
-* Thu Dec 01 2011 Deji Akingunola <dakingun at gmail.com> - 1.4.1p1-2
-- Rebuild for hwloc-1.3
+* Mon Jan  2 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1p1-4
+- Bump spec.
+
+* Wed Nov 16 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4.1p1-3
+- Comply to MPI guidelines by separating autoloading into separate package
+  (BZ #647147).
+
+* Tue Oct 18 2011 Deji Akingunola <dakingun at gmail.com> - 1.4.1p1-2
+- Rebuild for hwloc soname bump.
 
 * Sun Sep 11 2011 Deji Akingunola <dakingun at gmail.com> - 1.4.1p1-1
 - Update to 1.4.1p1 patch update
@@ -277,8 +300,8 @@ fi
 - Drop the mpd subpackage, the PM is no longer supported upstream
 - Fix undefined symbols in libmpichcxx (again) (#732926)
 
-* Sun Jul 17 2011 Deji Akingunola <dakingun at gmail.com> - 1.4-1
-- Rebuild for hwloc soname bump.
+* Wed Aug 03 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.4-2
+- Respect environment module guidelines wrt placement of module file.
 
 * Fri Jun 17 2011 Deji Akingunola <dakingun at gmail.com> - 1.4-1
 - Update to 1.4 final