[blacs] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

[Deji Akingunola]

commit afafb1dd5527cb54fef32d792cb2442b67cb9c4e
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Sun Jul 21 18:30:26 2013 -0400

    Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

 blacs.spec |   65 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 37 insertions(+), 28 deletions(-)
---
diff --git a/blacs.spec b/blacs.spec
index fe865ac..c6353cb 100644
--- a/blacs.spec
+++ b/blacs.spec
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -52,14 +52,16 @@ applications both easier to program and more portable.
 
 This file contains common files which are not specific to any MPI implementation.
 
-%package mpich2
-Summary: BLACS libraries compiled against mpich2
+%package mpich
+Summary: BLACS libraries compiled against mpich
 Group: Development/Libraries
-BuildRequires: mpich2-devel-static
+BuildRequires: mpich-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 1.1-50
 
-%description mpich2
+%description mpich
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
 an ongoing investigation whose purpose is to create a linear algebra
 oriented message passing interface that may be implemented efficiently
@@ -70,22 +72,26 @@ algorithms makes it impractical to rewrite programs for every new
 parallel machine. The BLACS exist in order to make linear algebra
 applications both easier to program and more portable.
 
-This package contains BLACS libraries compiled with mpich2.
+This package contains BLACS libraries compiled with mpich.
 
-%package mpich2-devel
-Summary: Development libraries for blacs (mpich2)
+%package mpich-devel
+Summary: Development libraries for blacs (mpich)
 Group: Development/Libraries
-Requires: %{name}-mpich2 = %{version}-%{release}
+Requires: %{name}-mpich = %{version}-%{release}
+Provides: %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes: %{name}-mpich2-devel < 1.1-50
 
-%description mpich2-devel
-This package contains development libraries for blacs, compiled against mpich2.
+%description mpich-devel
+This package contains development libraries for blacs, compiled against mpich.
 
-%package mpich2-static
-Summary: Static libraries for blacs (mpich2)
+%package mpich-static
+Summary: Static libraries for blacs (mpich)
 Group: Development/Libraries
+Provides: %{name}-mpich2-static = %{version}-%{release}
+Obsoletes: %{name}-mpich2-static < 1.1-50
 
-%description mpich2-static
-This package contains static libraries for blacs, compiled against mpich2.
+%description mpich-static
+This package contains static libraries for blacs, compiled against mpich.
 
 %if %{with openmpi}
 %package openmpi
@@ -127,7 +133,7 @@ This package contains static libraries for blacs, compiled against openmpi.
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-for i in mpich2 %{?with_openmpi:openmpi}
+for i in mpich %{?with_openmpi:openmpi}
 do
 	cp -ap BLACS BLACS-$i
 	cp -fp %{SOURCE1} BLACS-$i/
@@ -157,12 +163,12 @@ cd BLACS-$MPI_COMPILER_NAME; \
 make mpi ; \
 cd ..
 
-# Build mpich2 version
-export MPI_COMPILER_NAME=mpich2
-%{_mpich2_load}
+# Build mpich version
+export MPI_COMPILER_NAME=mpich
+%{_mpich_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
-%{_mpich2_unload}
+%{_mpich_unload}
 
 %if %{with openmpi}
 # Build OpenMPI version
@@ -180,7 +186,7 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %install
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in mpich2 %{?with_openmpi:openmpi}
+for i in mpich %{?with_openmpi:openmpi}
 do 
   mkdir -p %{buildroot}%{_libdir}/$i/lib/
   mkdir -p %{buildroot}%{_includedir}/$i-%{_arch}/
@@ -213,18 +219,18 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_includedir}/blacs/
 # %{_bindir}/x*test_MPI-LINUX-0
 
-%files mpich2
+%files mpich
 %defattr(-,root,root,0755)
-%{_libdir}/mpich2/lib/*.so.*
+%{_libdir}/mpich/lib/*.so.*
 
-%files mpich2-devel
+%files mpich-devel
 %defattr(-,root,root,0755)
-%{_includedir}/mpich2-%{_arch}/
-%{_libdir}/mpich2/lib/*.so
+%{_includedir}/mpich-%{_arch}/
+%{_libdir}/mpich/lib/*.so
 
-%files mpich2-static
+%files mpich-static
 %defattr(-,root,root,0755)
-%{_libdir}/mpich2/lib/*.a
+%{_libdir}/mpich/lib/*.a
 
 %if %{with openmpi}
 %files openmpi
@@ -242,6 +248,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sat Jul 20 2013 Deji Akingunola <dakingun at gmail.com> - 1.1-50
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Sun Mar 31 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.1-49
 - ARM has openmpi