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

[Deji Akingunola]

commit 2c4abe170993d561573247195c33267afc9a830c
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Jul 22 12:58:27 2013 -0400

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

 netcdf-cxx4.spec |   81 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 45 insertions(+), 36 deletions(-)
---
diff --git a/netcdf-cxx4.spec b/netcdf-cxx4.spec
index 371c0d9..f55e8bc 100644
--- a/netcdf-cxx4.spec
+++ b/netcdf-cxx4.spec
@@ -1,6 +1,6 @@
 Name:           netcdf-cxx4
 Version:        4.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetCDF-4 C++ library
 
 Group:          Applications/Engineering
@@ -14,12 +14,12 @@ BuildRequires:  netcdf-devel
 #https://trac.mcs.anl.gov/projects/mpich2/ticket/1576
 BuildRequires:  openssh-clients
 
-%global with_mpich2 1
+%global with_mpich 1
 %global with_openmpi 1
 %if 0%{?rhel}
 %ifarch ppc64
 # No mpich2 on ppc64 in EL
-%global with_mpich2 0
+%global with_mpich 0
 %endif
 %endif
 %ifarch s390 s390x
@@ -27,8 +27,8 @@ BuildRequires:  openssh-clients
 %global with_openmpi 0
 %endif
 
-%if %{with_mpich2}
-%global mpi_list mpich2
+%if %{with_mpich}
+%global mpi_list mpich
 %endif
 %if %{with_openmpi}
 %global mpi_list %{?mpi_list} openmpi
@@ -58,38 +58,44 @@ Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Static library for netCDF-4 C++ API.
 
 
-%if %{with_mpich2}
-%package mpich2
-Summary: NetCDF mpich2 libraries
+%if %{with_mpich}
+%package mpich
+Summary: NetCDF mpich libraries
 Group: Development/Libraries
-Requires: mpich2
-BuildRequires: mpich2-devel
-BuildRequires: netcdf-mpich2-devel
+Requires: mpich
+BuildRequires: mpich-devel
+BuildRequires: netcdf-mpich-devel
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 4.2-8
 
-%description mpich2
-NetCDF parallel mpich2 libraries
+%description mpich
+NetCDF parallel mpich libraries
 
 
-%package mpich2-devel
-Summary: NetCDF mpich2 development files
+%package mpich-devel
+Summary: NetCDF mpich development files
 Group: Development/Libraries
-Requires: %{name}-mpich2%{?_isa} = %{version}-%{release}
-Requires: mpich2
+Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
+Requires: mpich
 Requires: pkgconfig
-Requires: netcdf-mpich2-devel
+Requires: netcdf-mpich-devel
 Requires: libcurl-devel
+Provides: %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes: %{name}-mpich2-devel < 4.2-8
 
-%description mpich2-devel
-NetCDF parallel mpich2 development files
+%description mpich-devel
+NetCDF parallel mpich development files
 
 
-%package mpich2-static
-Summary: NetCDF mpich2 static libraries
+%package mpich-static
+Summary: NetCDF mpich static libraries
 Group: Development/Libraries
-Requires: %{name}-mpich2-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
+Provides: %{name}-mpich2-static = %{version}-%{release}
+Obsoletes: %{name}-mpich2-static < 4.2-8
 
-%description mpich2-static
-NetCDF parallel mpich2 static libraries
+%description mpich-static
+NetCDF parallel mpich static libraries
 %endif
 
 
@@ -182,7 +188,7 @@ done
 
 %check
 make -C build check
-for mpi in mpich2 openmpi
+for mpi in mpich openmpi
 do
   module load mpi/$mpi-%{_arch}
   make -C $mpi check
@@ -214,19 +220,19 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libnetcdf_c++4.a
 
 
-%if %{with_mpich2}
-%files mpich2
+%if %{with_mpich}
+%files mpich
 %doc COPYRIGHT
-%{_libdir}/mpich2/lib/*.so.*
+%{_libdir}/mpich/lib/*.so.*
 
-%files mpich2-devel
-%{_libdir}/mpich2/bin/ncxx4-config
-%{_includedir}/mpich2-%{_arch}/*
-%{_libdir}/mpich2/lib/*.so
-%{_libdir}/mpich2/lib/pkgconfig/%{name}.pc
+%files mpich-devel
+%{_libdir}/mpich/bin/ncxx4-config
+%{_includedir}/mpich-%{_arch}/*
+%{_libdir}/mpich/lib/*.so
+%{_libdir}/mpich/lib/pkgconfig/%{name}.pc
 
-%files mpich2-static
-%{_libdir}/mpich2/lib/*.a
+%files mpich-static
+%{_libdir}/mpich/lib/*.a
 %endif
 
 %if %{with_openmpi}
@@ -246,6 +252,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Jul 22 2013 Deji Akingunola <dakingun at gmail.com> - 4.2-8
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild