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

[Deji Akingunola]

commit aff82bdb33c0cb5bd9fcb932360cfc21d5e9b562
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Jul 22 16:18:49 2013 -0400

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

 mathgl.spec |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/mathgl.spec b/mathgl.spec
index 07e6805..064f83b 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,6 +1,6 @@
 Name:          mathgl
 Version:       2.1.2
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Cross-platform library for making high-quality scientific graphics
 Summary(de):   Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
 Summary(ru):   Библиотека для осуществления высококачественной визуализации данных
@@ -145,22 +145,26 @@ Requires:      %{name}-openmpi%{_isa} = %{version}-%{release}
 %description openmpi-devel
 %{summary}.
 
-%package mpich2
-Summary:       MPICH2 version of %{name} library
+%package mpich
+Summary:       MPICH version of %{name} library
 Group:         Applications/Engineering
-BuildRequires: mpich2-devel
-Requires:      mpich2
+BuildRequires: mpich-devel
+Requires:      mpich
 Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name}-mpich2 = %{version}-%{release}
+Obsoletes:     %{name}-mpich2 < 2.1.2-9
 
-%description mpich2
+%description mpich
 %{summary}.
 
-%package mpich2-devel
-Summary:       Devel files for MPICH2 version of %{name} library
+%package mpich-devel
+Summary:       Devel files for MPICH version of %{name} library
 Group:         Applications/Engineering
-Requires:      %{name}-mpich2%{_isa} = %{version}-%{release}
+Requires:      %{name}-mpich%{_isa} = %{version}-%{release}
+Provides:      %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes:     %{name}-mpich2-devel < 2.1.2-9
 
-%description mpich2-devel
+%description mpich-devel
 %{summary}.
 
 %prep
@@ -221,9 +225,9 @@ MPI_COMPILER_NAME=openmpi %building
 %{_openmpi_unload}
 
 # MPICH2
-%{_mpich2_load}
-MPI_COMPILER_NAME=mpich2 %building
-%{_mpich2_unload}
+%{_mpich_load}
+MPI_COMPILER_NAME=mpich %building
+%{_mpich_unload}
 
 %install
 rm -rf %{buildroot}
@@ -246,10 +250,10 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install
 MPI_COMPILER_NAME=openmpi %installing
 %{_openmpi_unload}
 
-# MPICH2
-%{_mpich2_load}
-MPI_COMPILER_NAME=mpich2 %installing
-%{_mpich2_unload}
+# MPICH
+%{_mpich_load}
+MPI_COMPILER_NAME=mpich %installing
+%{_mpich_unload}
 
 #Remove symlink to .so file in python dir. Let python find libs normally
 unlink %{buildroot}/%{python_sitelib}/_mathgl.so
@@ -328,17 +332,20 @@ rm -rf %{buildroot}
 %{_libdir}/openmpi/lib/*.so
 %{_includedir}/openmpi-%{_arch}/mgl2/
 
-%files mpich2
+%files mpich
 %doc COPYING
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/*.so.*
+%{_libdir}/mpich/lib/*.so.*
 
-%files mpich2-devel
+%files mpich-devel
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/*.so
-%{_includedir}/mpich2-%{_arch}/mgl2/
+%{_libdir}/mpich/lib/*.so
+%{_includedir}/mpich-%{_arch}/mgl2/
 
 %changelog
+* Mon Jul 22 2013 Deji Akingunola <dakingun at gmail.com> - 2.1.2-9
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 2.1.2-8
 - Rebuild for hdf5 1.8.11