[cp2k/f19] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

[Deji Akingunola]

commit 5913b75f29e9c2bba94d37baac24ea29538cf3b7
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Aug 5 23:27:21 2013 -0400

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

 cp2k.spec |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/cp2k.spec b/cp2k.spec
index 806581a..a9eee5f 100644
--- a/cp2k.spec
+++ b/cp2k.spec
@@ -3,7 +3,7 @@
 
 Name: cp2k
 Version: 2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Engineering
 Summary: A molecular dynamics engine capable of classical and Car-Parrinello simulations
 License: GPLv2+
@@ -78,20 +78,22 @@ Requires: scalapack-openmpi
 
 This package contains the multi-threaded version (using OpenMPI).
 
-%package mpich2
+%package mpich
 Group: Applications/Engineering
-Summary: Molecular simulations software - mpich2 version
-BuildRequires:  mpich2-devel
-BuildRequires:  blacs-mpich2-devel
-BuildRequires:  scalapack-mpich2-devel
+Summary: Molecular simulations software - mpich version
+BuildRequires:  mpich-devel
+BuildRequires:  blacs-mpich-devel
+BuildRequires:  scalapack-mpich-devel
 Requires: %{name}-common = %{version}-%{release}
-Requires: blacs-mpich2
-Requires: scalapack-mpich2
+Requires: blacs-mpich
+Requires: scalapack-mpich
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 2.4-3
 
-%description mpich2
+%description mpich
 %{cp2k_desc_base}
 
-This package contains the multi-threaded version (using mpich2).
+This package contains the multi-threaded version (using mpich).
 
 %package common
 Group: Applications/Engineering
@@ -105,7 +107,7 @@ This package contains the documentation and the manual.
 %prep
 %setup -q
 cp -p %{SOURCE1} arch/
-cp -p %{SOURCE1} arch/Linux-gfortran-mpich2.popt
+cp -p %{SOURCE1} arch/Linux-gfortran-mpich.popt
 cp -p %{SOURCE2} arch/
 cp -p %{SOURCE3} arch/
 %patch0 -p1 -b .r
@@ -113,7 +115,7 @@ rm -r tools/makedepf90
 chmod -x src/harris_{functional,{env,energy}_types}.F
 # fix crashes in fftw on i686
 %ifarch i686
-sed -i 's/-D__FFTW3/-D__FFTW3 -D__FFTW3_UNALIGNED/g' arch/Linux-i686-gfortran* arch/Linux-gfortran-{mpich2,openmpi}.popt
+sed -i 's/-D__FFTW3/-D__FFTW3 -D__FFTW3_UNALIGNED/g' arch/Linux-i686-gfortran* arch/Linux-gfortran-{mpich,openmpi}.popt
 %endif
 
 %build
@@ -121,9 +123,9 @@ pushd makefiles
     %{_openmpi_load}
         make OPTFLAGS="%{optflags} -L%{_libdir}/atlas" %{?_smp_mflags} ARCH="Linux-gfortran-openmpi" VERSION=popt
     %{_openmpi_unload}
-    %{_mpich2_load}
-        make OPTFLAGS="%{optflags} -L%{_libdir}/atlas" %{?_smp_mflags} ARCH="Linux-gfortran-mpich2" VERSION=popt
-    %{_mpich2_unload}
+    %{_mpich_load}
+        make OPTFLAGS="%{optflags} -L%{_libdir}/atlas" %{?_smp_mflags} ARCH="Linux-gfortran-mpich" VERSION=popt
+    %{_mpich_unload}
 
     make OPTFLAGS="%{optflags} -L%{_libdir}/atlas" %{?_smp_mflags} sopt ssmp
 popd
@@ -135,10 +137,10 @@ install -d %{buildroot}%{_bindir}
     mkdir -p %{buildroot}%{_libdir}/openmpi%{?_opt_cc_suffix}/bin/
     install -pm755 exe/Linux-gfortran-openmpi/cp2k.popt %{buildroot}%{_libdir}/openmpi%{?_opt_cc_suffix}/bin/cp2k.popt_openmpi
 %{_openmpi_unload}
-%{_mpich2_load}
-    mkdir -p %{buildroot}%{_libdir}/mpich2%{?_opt_cc_suffix}/bin/
-    install -pm755 exe/Linux-gfortran-mpich2/cp2k.popt %{buildroot}%{_libdir}/mpich2%{?_opt_cc_suffix}/bin/cp2k.popt_mpich2
-%{_mpich2_unload}
+%{_mpich_load}
+    mkdir -p %{buildroot}%{_libdir}/mpich%{?_opt_cc_suffix}/bin/
+    install -pm755 exe/Linux-gfortran-mpich/cp2k.popt %{buildroot}%{_libdir}/mpich%{?_opt_cc_suffix}/bin/cp2k.popt_mpich
+%{_mpich_unload}
 install -pm755 exe/`tools/get_arch_code`/cp2k.sopt %{buildroot}%{_bindir}
 install -pm755 exe/`tools/get_arch_code`/cp2k.ssmp %{buildroot}%{_bindir}
 
@@ -178,11 +180,14 @@ popd
 %defattr(-,root,root,-)
 %{_libdir}/openmpi%{?_opt_cc_suffix}/bin/cp2k.popt_openmpi
 
-%files mpich2
+%files mpich
 %defattr(-,root,root,-)
-%{_libdir}/mpich2%{?_opt_cc_suffix}/bin/cp2k.popt_mpich2
+%{_libdir}/mpich%{?_opt_cc_suffix}/bin/cp2k.popt_mpich
 
 %changelog
+* Mon Aug 05 2013 Deji Akingunola <dakingun at gmail.com> - 2.4-3
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Wed Jun 19 2013 Dominik Mierzejewski <rpm at greysector.net> - 2.4-2
 - add MPI implementation suffix back to MPI binaries (required by guidelines)