[espresso/f18] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

[Deji Akingunola]

commit cfc9bd0e7f620e002be716e388c2240549e77aa1
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Jul 23 23:42:15 2013 -0400

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

 espresso.spec |   64 ++++++++++++++++++++++++---------------------------------
 1 files changed, 27 insertions(+), 37 deletions(-)
---
diff --git a/espresso.spec b/espresso.spec
index 621809a..0c3b082 100644
--- a/espresso.spec
+++ b/espresso.spec
@@ -14,14 +14,14 @@
 # So to easy enable/disable the testsuite, I introduce the following
 #   variables:
 #
-# * MPD:       if '1' enable mpich2, which requires mpd to start
+# * MPICH:     if '1' enable mpich
 # * OPENMPI:   if '1' enable openmpi
 %global MPD 0
 %global OPENMPI 0
 
 Name:           espresso
 Version:        3.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extensible Simulation Package for Research on Soft matter
 Group:          System Environment/Libraries
 
@@ -40,9 +40,6 @@ BuildRequires:  fftw-devel
 
 Requires:       %{name}-common = %{version}-%{release}
 
-# for the testsuite: 'pwgen' is needed to create a random password
-BuildRequires:  pwgen
-
 %description
 ESPResSo can perform Molecular Dynamics simulations of bead-spring models
 in various ensembles ((N,V,E), (N,V,T), and (N,p,T)).
@@ -82,13 +79,15 @@ ESPResSo contains a number of advanced algorithms, e.g.
 This package contains %{name} compiled against Open MPI.
 
 
-%package mpich2
-BuildRequires:  mpich2-devel
-Requires:       mpich2%{?_isa}
+%package mpich
+BuildRequires:  mpich-devel
+Requires:       mpich%{?_isa}
 Requires:       %{name}-common = %{version}-%{release}
 Summary:        Extensible Simulation Package for Research on Soft matter
 Group:          System Environment/Libraries 
-%description mpich2
+Provides:	%{name}-mpich2 = %{version}-%{release}
+Obsoletes:	%{name}-mpich2 < 3.0.2-5
+%description mpich
 ESPResSo can perform Molecular Dynamics simulations of bead-spring models
 in various ensembles ((N,V,E), (N,V,T), and (N,p,T)).
 ESPResSo contains a number of advanced algorithms, e.g.
@@ -96,7 +95,7 @@ ESPResSo contains a number of advanced algorithms, e.g.
     * P3M, MMM2D, MMM1D, ELC for electrostatic interactions
     * Lattice-Boltzmann for hydrodynamics 
 
-This package contains %{name} compiled against MPICH2.
+This package contains %{name} compiled against MPICH.
 
 
 %prep
@@ -106,7 +105,7 @@ autoreconf -fi
 
 sed -i 's/tclsh8\.4/tclsh/' tools/trace_memory.tcl
 
-mkdir openmpi_build mpich2_build no_mpi
+mkdir openmpi_build mpich_build no_mpi
 
 
 %build
@@ -129,13 +128,13 @@ make %{?_smp_mflags}
 popd
 %{_openmpi_unload}
 
-# Build mpich2 version
-%{_mpich2_load}
-pushd mpich2_build
+# Build mpich version
+%{_mpich_load}
+pushd mpich_build
 %dconfigure_mpi --enable-shared --with-tk --program-suffix=$MPI_SUFFIX
 make %{?_smp_mflags}
 popd
-%{_mpich2_unload}
+%{_mpich_unload}
 
 
 %install
@@ -147,11 +146,11 @@ make install DESTDIR=%{buildroot}
 popd
 %{_openmpi_unload}
 
-%{_mpich2_load}
-pushd mpich2_build
+%{_mpich_load}
+pushd mpich_build
 make install DESTDIR=%{buildroot}
 popd
-%{_mpich2_unload}
+%{_mpich_unload}
 
 
 pushd no_mpi
@@ -179,25 +178,13 @@ popd
 %{_openmpi_unload}
 %endif
 
-# test mpd?
-%if 0%{?MPD}
-%{_mpich2_load}
-# create mpd.conf
-#export MPD_CONF_FILE=mpd.conf
-#echo MPD_SECRETWORD=$(pwgen -s 50 1) > mpd.conf
-#chmod 600 mpd.conf
-#mpd --daemon
-
-pushd mpich2_build
+# test mpich?
+%if 0%{?MPICH}
+%{_mpich_load}
+pushd mpich_build
 make check || cat testsuite/*.err || :
 popd
-
-#mpdallexit
-
-# delete mpd.conf again
-#rm mpd.conf
-#unset MPD_CONF_FILE
-%{_mpich2_unload}
+%{_mpich_unload}
 %endif
 
 
@@ -211,11 +198,14 @@ popd
 %files openmpi
 %{_libdir}/openmpi/bin/Espresso_openmpi
 
-%files mpich2
-%{_libdir}/mpich2/bin/Espresso_mpich2
+%files mpich
+%{_libdir}/mpich/bin/Espresso_mpich
 
 
 %changelog
+* Tue Jul 23 2013 Deji Akingunola <dakingun at gmail.com> - 3.0.2-5
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild