rpms/arpack/devel arpack.spec,1.8,1.9

[athimm]

Author: athimm

Update of /cvs/pkgs/rpms/arpack/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22028/devel

Modified Files:
	arpack.spec 
Log Message:
Undo "clean up".


Index: arpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpack/devel/arpack.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- arpack.spec	7 Jul 2010 17:39:48 -0000	1.8
+++ arpack.spec	8 Jul 2010 16:05:15 -0000	1.9
@@ -1,7 +1,9 @@
+%bcond_without gfortran
+
 Summary: Fortran77 subroutines for solving large scale eigenvalue problems
 Name: arpack
 Version: 2.1
-Release: 13%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.caam.rice.edu/software/ARPACK/
@@ -13,8 +15,10 @@ Patch0: arpack-2.1-redhat.patch
 Patch1: arpack-second-bug.patch
 Patch2: arpack-etime.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: gcc-gfortran
-BuildRequires: lapack-devel
+BuildRequires: %{?with_gfortran:gcc-gfortran}%{!?with_gfortran:/usr/bin/f77}
+# The correct dependency would be the following, but it doesn't exist on RHEL4/3
+#BuildRequires: lapack-devel
+BuildRequires: %{_libdir}/liblapack.so
 
 %description
 ARPACK is a collection of Fortran77 subroutines designed to solve large 
@@ -59,7 +63,7 @@ mkdir static shared
 cd shared
 for dir in ../SRC ../UTIL; do
   make -f $dir/Makefile VPATH=$dir srcdir=$dir \
-       FC=gfortran FFLAGS="%{optflags} -fPIC" \
+       %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags} -fPIC" \
        single double complex complex16
 done
 gcc -shared -llapack -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o
@@ -67,7 +71,7 @@ cd ..
 cd static
 for dir in ../SRC ../UTIL; do
   make -f $dir/Makefile VPATH=$dir srcdir=$dir \
-       FC=gfortran FFLAGS="%{optflags}" LDFLAGS="-s" \
+  %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags}" LDFLAGS="-s" \
        all
 done
 ar rv libarpack.a *.o
@@ -104,9 +108,7 @@ rm -rf %{buildroot}
 %{_libdir}/libarpack.a
 
 %changelog
-* Wed Jul  7 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1-13
-- Get rid of build conditionals related to EPEL 3/4 for which have not been
-  branched.
+* Wed Jul  7 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1-12
 - Bump spec to fix update path.
 
 * Wed Apr  7 2010 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1-11