[mpich/f18] Add proper Provides and Obsoletes for the sub-packages

[Deji Akingunola]

commit 44697a5bb7b3c60f286b1fc9e63d934da5aae8c7
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Jul 23 17:39:12 2013 -0400

    Add proper Provides and Obsoletes for the sub-packages
    
    - Configure to use embedded hwloc because the F18 hwloc is less than the
       recommended version

 mpich.spec |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/mpich.spec b/mpich.spec
index 3167daa..4d57814 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -3,7 +3,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich
 Version:	3.0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mpich.org/
@@ -13,7 +13,7 @@ Source1:	mpich.macros
 Patch0:		mpich-modules.patch
 
 BuildRequires:	gcc-gfortran
-BuildRequires:  hwloc-devel >= 1.6
+#BuildRequires:  hwloc-devel >= 1.6
 %ifnarch s390 s390x %{arm}
 BuildRequires:	valgrind-devel
 %endif
@@ -47,6 +47,8 @@ mpich-autoload package.
 Summary:	Load mpich automatically into profile
 Group:		System Environment/Base
 Requires:	mpich = %{version}-%{release}
+Provides:	mpich2-autoload = 3.0.1
+Obsoletes:	mpich2-autoload < 3.0
 
 %description autoload
 This package contains profile files that make mpich automatically loaded.
@@ -58,6 +60,8 @@ Provides:	%{name}-devel-static = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran 
+Provides:	mpich2-devel = 3.0.1
+Obsoletes:	mpich2-devel < 3.0
 
 %description devel
 Contains development headers and libraries for mpich
@@ -67,6 +71,8 @@ Summary:	Documentations and examples for mpich
 Group:		Documentation
 BuildArch:	noarch
 Requires:	%{name}-devel = %{version}-%{release}
+Provides:	mpich2-doc = 3.0.1
+Obsoletes:	mpich2-doc < 3.0
 
 %description doc
 Contains documentations, examples and man-pages for mpich
@@ -124,7 +130,7 @@ Contains documentations, examples and man-pages for mpich
 	--mandir=%{_mandir}/%{name}				\
 	--docdir=%{_datadir}/%{name}/doc			\
 	--htmldir=%{_datadir}/%{name}/doc			\
-	--with-hwloc-prefix=system				\
+	--with-hwloc-prefix=embedded				\
 	FC=%{opt_fc}						\
 	F77=%{opt_f77}						\
 	CFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
@@ -218,6 +224,11 @@ rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a
 %{_mandir}/%{name}/man3/
 
 %changelog
+* Sat Jul 20 2013 Deji Akingunola <dakingun at gmail.com> - 3.0.4-3
+- Add proper Provides and Obsoletes for the sub-packages
+- Configure to use embedded hwloc because the F18 hwloc is less than the 
+   recommended version   
+
 * Thu Jul 18 2013 Deji Akingunola <dakingun at gmail.com> - 3.0.4-2
 - Fix some of the rpmlint warnings from package review (BZ #973493)