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

Wed Jul 24 17:47:59 UTC 2013

commit b8627943f79997527c27ca9241d48257e838b25a
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Wed Jul 24 13:47:53 2013 -0400

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

 scalapack.spec |   70 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 30 deletions(-)
---

diff --git a/scalapack.spec b/scalapack.spec
index b762bc4..936c75e 100644
--- a/scalapack.spec
+++ b/scalapack.spec
@@ -1,7 +1,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogeneous computing
 Name: scalapack
 Version: 1.7.5
-Release: 16%{?dist}
+Release: 17%{?dist}
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -9,7 +9,7 @@ URL: http://www.netlib.org/lapack-dev/
 Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz
 BuildRequires: lapack-devel, blas-devel
 BuildRequires: gcc-gfortran, glibc-devel
-BuildRequires: blacs-mpich2-devel, mpich2-devel-static
+BuildRequires: blacs-mpich-devel, mpich-devel-static
 BuildRequires: blacs-openmpi-devel, openmpi-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: scalapack-1.7-fedora.patch
@@ -73,18 +73,20 @@ routines resemble their LAPACK equivalents as much as possible.
 This package contains common files which are not specific
 to any MPI implementation.
 
-%package mpich2
-Summary: ScaLAPACK libraries compiled against mpich2
+%package mpich
+Summary: ScaLAPACK libraries compiled against mpich
 Group: Development/Libraries
 Requires: %{name}-common = %{version}-%{release}
 # For dir ownership
-Requires: mpich2
+Requires: mpich
 
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 1.7.5-17
 # This is a lie, but something needs to obsolete it.
 Provides: %{name}-lam = %{version}-%{release}
 Obsoletes: %{name}-lam <= 1.7.5-7
 
-%description mpich2
+%description mpich
 The ScaLAPACK (or Scalable LAPACK) library includes a subset
 of LAPACK routines redesigned for distributed memory MIMD
 parallel computers. It is currently written in a
@@ -110,27 +112,31 @@ routines, all inter-processor communication occurs within the PBLAS and the
 BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK
 routines resemble their LAPACK equivalents as much as possible.
 
-This package contains ScaLAPACK libraries compiled with mpich2.
+This package contains ScaLAPACK libraries compiled with mpich.
 
-%package mpich2-devel
-Summary: Development libraries for ScaLAPACK (mpich2)
+%package mpich-devel
+Summary: Development libraries for ScaLAPACK (mpich)
 Group: Development/Libraries
-Requires: %{name}-mpich2 = %{version}-%{release}
+Requires: %{name}-mpich = %{version}-%{release}
 Provides: %{name}-lam-devel = %{version}-%{release}
 Obsoletes: %{name}-lam-devel <= 1.7.5-7
+Provides: %{name}-mpich2-devel = %{version}-%{release}
+Obsoletes: %{name}-mpich2-devel < 1.7.5-17
 
-%description mpich2-devel
-This package contains development libraries for ScaLAPACK, compiled against mpich2.
+%description mpich-devel
+This package contains development libraries for ScaLAPACK, compiled against mpich.
 
-%package mpich2-static
-Summary: Static libraries for ScaLAPACK (mpich2)
+%package mpich-static
+Summary: Static libraries for ScaLAPACK (mpich)
 Group: Development/Libraries
 Provides: %{name}-lam-static = %{version}-%{release}
 Obsoletes: %{name}-lam-static <= 1.7.5-7
-Requires: %{name}-mpich2-devel = %{version}-%{release}
+Requires: %{name}-mpich-devel = %{version}-%{release}
+Provides: %{name}-mpich2-static = %{version}-%{release}
+Obsoletes: %{name}-mpich2-static < 1.7.5-17
 
-%description mpich2-static
-This package contains static libraries for ScaLAPACK, compiled against mpich2.
+%description mpich-static
+This package contains static libraries for ScaLAPACK, compiled against mpich.
 
 %package openmpi
 Summary: ScaLAPACK libraries compiled against openmpi
@@ -189,7 +195,7 @@ This package contains static libraries for ScaLAPACK, compiled against openmpi.
 cd %{name}-%{version}/
 sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 cd ..
-for i in mpich2 openmpi; do
+for i in mpich openmpi; do
   cp -a %{name}-%{version} %{name}-%{version}-$i
   sed -i "s|FOO|$i|g" %{name}-%{version}-$i/SLmake.inc
 done
@@ -200,12 +206,12 @@ cd %{name}-%{version}-$MPI_COMPILER_NAME ; \
 make lib ; \
 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}
 
 # Build OpenMPI version
 export MPI_COMPILER_NAME=openmpi
@@ -219,7 +225,7 @@ rm -fr ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in mpich2 openmpi; do
+for i in mpich openmpi; do
   mkdir -p %{buildroot}%{_libdir}/$i/lib/
   pushd %{name}-%{version}-$i
   for f in *.a *.so*; do
@@ -247,17 +253,17 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc scalapack_install.ps README
 # %{_bindir}/x*
 
-%files mpich2
+%files mpich
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/libscalapack.so.*
+%{_libdir}/mpich/lib/libscalapack.so.*
 
-%files mpich2-devel
+%files mpich-devel
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/libscalapack.so
+%{_libdir}/mpich/lib/libscalapack.so
 
-%files mpich2-static
+%files mpich-static
 %defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/libscalapack.a
+%{_libdir}/mpich/lib/libscalapack.a
 
 %files openmpi
 %defattr(-,root,root,-)
@@ -272,6 +278,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/openmpi/lib/libscalapack.a
 
 %changelog
+* Wed Jul 24 2013 Deji Akingunola <dakingun at gmail.com> - 1.7.5-17
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.5-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -299,7 +309,7 @@ rm -fr ${RPM_BUILD_ROOT}
 - Move all BuildRequires to the top of the spec file
 - -static packages now Require matching -devel package, they're not very useful otherwise
 
-* Wed Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-9
+* Tue Dec 15 2009 Deji Akingunola <dakingun at gmail.com> - 1.7.5-9
 - Buildrequire mpich2-devel-static
 
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.5-8
