[apbs/el5/master: 7/7] - fix build on EL-5 (add missing BR: gcc-gfortran, run libtoolize with --force) - link only to atlas

[Dominik Mierzejewski]

commit b5662b32b568da77245439ccf32ce8ae2ad86ba4
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Wed Mar 16 16:22:30 2011 +0100

    - fix build on EL-5 (add missing BR: gcc-gfortran, run libtoolize with --force)
    - link only to atlas-provided blas for performance

 apbs.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/apbs.spec b/apbs.spec
index 7c82072..276724c 100644
--- a/apbs.spec
+++ b/apbs.spec
@@ -3,7 +3,7 @@
 Name: apbs
 Summary: Adaptive Poisson Boltzmann Solver
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # License of pmgZ, aqua and contrib/blas/mblasd.f is LGPLv2+, the rest is BSD.
 License: LGPLv2+ and BSD
 Group: Applications/Engineering
@@ -15,12 +15,10 @@ Patch0: apbs-configure.ac.patch
 # removes hardcoded prefix setting so DESTDIR works
 Patch1: apbs-makefile.am.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: gcc-gfotran
 BuildRequires: libtool
 BuildRequires: arpack-devel
 BuildRequires: atlas-devel
-BuildRequires: blas-devel
 BuildRequires: maloc-devel
 BuildRequires: python-devel
 Requires: python-ZSI
@@ -72,7 +70,7 @@ library.
 %setup -q -n %{name}-%{version}-source
 %patch0 -p0
 %patch1 -p0
-libtoolize --automake
+libtoolize --automake --force
 aclocal
 autoheader
 automake --gnu
@@ -91,7 +89,7 @@ rm doc/programmer/html/vpee_8h__incl.map
 rm doc/programmer/html/dummy_8c__incl.map
 
 %build
-%configure --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE"
+%configure --with-blas-name=cblas --with-blas='-L%{_libdir}/atlas -lf77blas -latlas -lcblas' --with-fetk-include=%{_includedir} --with-fetk-library=%{_libdir} --with-arpack=%{_libdir}/atlas --enable-python --enable-shared FFLAGS="${RPM_OPT_FLAGS} -I/usr/include/atlas" CFLAGS="${RPM_OPT_FLAGS} -DVF77_ONEUNDERSCORE"
 # die, rpath, die.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -172,6 +170,10 @@ rm -rf %{buildroot}
 %doc doc/programmer/
 
 %changelog
+* Wed Mar 16 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-3
+- fix build on EL-5 (add missing BR: gcc-gfortran, run libtoolize with --force)
+- link only to atlas-provided blas for performance
+
 * Tue Dec 01 2009 Tim Fenn <fenn at stanford.edu> - 1.2.1-2
 - add RPM_OPT_FLAGS