[blacs/el6] update and build for el6

[Tom Callaway]

commit 015151037461453f12a3b76233005ef7fe35ee82
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Feb 28 14:10:58 2013 -0500

    update and build for el6

 blacs.spec |   58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 14 deletions(-)
---
diff --git a/blacs.spec b/blacs.spec
index 376242a..90b73e4 100644
--- a/blacs.spec
+++ b/blacs.spec
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 39%{?dist}.1
+Release: 47%{?dist}
 License: Public Domain
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -14,10 +14,16 @@ Source5: http://www.netlib.org/blacs/f77blacsqref.ps
 Source6: http://www.netlib.org/blacs/cblacsqref.ps
 Source7: http://www.netlib.org/blacs/lawn94.ps
 BuildRequires: gcc-gfortran
-BuildRequires: lapack, blas
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-fedora.patch
 
+%ifarch s390 s390x %{arm}
+  # No OpenMPI support on these arches
+  %bcond_with openmpi
+%else
+  %bcond_without openmpi
+%endif
+
+
 %description
 The BLACS (Basic Linear Algebra Communication Subprograms) project is 
 an ongoing investigation whose purpose is to create a linear algebra 
@@ -32,7 +38,6 @@ applications both easier to program and more portable.
 %package common
 Summary: Common files for blacs
 Group: Development/Libraries
-Requires: lapack, blas
 
 %description common
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -53,9 +58,6 @@ Group: Development/Libraries
 BuildRequires: mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
-# This is a dirty lie, but something needs to reap these dead subpackages.
-Provides: blacs-lam = %{version}-%{release}
-Obsoletes: blacs-lam < 1.1-34
 
 %description mpich2
 The BLACS (Basic Linear Algebra Communication Subprograms) project is
@@ -74,9 +76,6 @@ This package contains BLACS libraries compiled with mpich2.
 Summary: Development libraries for blacs (mpich2)
 Group: Development/Libraries
 Requires: %{name}-mpich2 = %{version}-%{release}
-# This is a dirty lie, but something needs to reap these dead subpackages.
-Provides: blacs-lam-devel = %{version}-%{release}
-Obsoletes: blacs-lam-devel < 1.1-34
 
 %description mpich2-devel
 This package contains development libraries for blacs, compiled against mpich2.
@@ -88,6 +87,7 @@ Group: Development/Libraries
 %description mpich2-static
 This package contains static libraries for blacs, compiled against mpich2.
 
+%if %{with openmpi}
 %package openmpi
 Summary: BLACS libraries compiled against openmpi
 Group: Development/Libraries
@@ -122,18 +122,22 @@ Group: Development/Libraries
 
 %description openmpi-static
 This package contains static libraries for blacs, compiled against openmpi.
+%endif
 
 %prep
 %setup -q -c -n %{name}
 %patch0 -p1
-for i in mpich2 openmpi; do
+for i in mpich2 %{?with_openmpi:openmpi}
+do
 	cp -ap BLACS BLACS-$i
 	cp -fp %{SOURCE1} BLACS-$i/
 	sed -i "s|FOO|$i|g" BLACS-$i/Bmake.inc
 done
 
+%if %{with openmpi}
 # openmpi doesn't use TRANSCOMM = -DUseMpich
 sed -i "s|-DUseMpich||g" BLACS-openmpi/Bmake.inc
+%endif
 
 # copy in docs:
 cp -p %{SOURCE2} mpi_prop.ps
@@ -160,12 +164,14 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_mpich2_unload}
 
+%if %{with openmpi}
 # Build OpenMPI version
 export MPI_COMPILER_NAME=openmpi
 %{_openmpi_load}
 RPM_OPT_FLAGS=`echo $CFLAGS`
 %dobuild
 %{_openmpi_unload}
+%endif
 
 # cd TESTING/
 # make
@@ -174,7 +180,8 @@ RPM_OPT_FLAGS=`echo $CFLAGS`
 %install
 # mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 
-for i in mpich2 openmpi; do 
+for i in mpich2 %{?with_openmpi:openmpi}
+do 
   mkdir -p %{buildroot}%{_libdir}/$i/lib/
   mkdir -p %{buildroot}%{_includedir}/$i-%{_arch}/
   mkdir -p %{buildroot}%{_includedir}/blacs/
@@ -219,6 +226,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %defattr(-,root,root,0755)
 %{_libdir}/mpich2/lib/*.a
 
+%if %{with openmpi}
 %files openmpi
 %defattr(-,root,root,0755)
 %{_libdir}/openmpi/lib/*.so.*
@@ -231,10 +239,32 @@ rm -fr ${RPM_BUILD_ROOT}
 %files openmpi-static
 %defattr(-,root,root,0755)
 %{_libdir}/openmpi/lib/*.a
+%endif
 
 %changelog
-* Sat Apr 17 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-39.1
-- f12 still needs provides/obsoletes for old lam ghosts
+* Thu Nov 15 2012 Tom Callaway <spot at fedoraproject.org> - 1.1-47
+- rebuild for new mpich2
+
+* Tue Jul 24 2012 Tom Callaway <spot at fedoraproject.org> - 1.1-46
+- drop unnecessary Requires/BuildRequires for lapack & blas
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Mar 29 2011 Deji Akingunola <dakingun at gmail.com> - 1.1-43
+- Rebuild for mpich2 soname bump
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Oct 19 2010 Deji Akingunola <dakingun at gmail.com> - 1.1-41
+- Rebuild for both mpich2 and openmpi updates
+
+* Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 1.1-40
+- conditionalize openmpi support
 
 * Tue Apr 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1-39
 - openmpi doesn't use TRANSCOMM	= -DUseMpich