rpms/arpack/EL-5 arpack.spec,1.6,1.7

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/arpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23680

Modified Files:
	arpack.spec 
Log Message:
Use conditionals based on the distribution version.


Index: arpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpack/EL-5/arpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- arpack.spec	24 Jul 2009 17:07:38 -0000	1.6
+++ arpack.spec	19 Jan 2010 19:52:01 -0000	1.7
@@ -1,9 +1,7 @@
-%bcond_without gfortran
-
 Summary: Fortran77 subroutines for solving large scale eigenvalue problems
 Name: arpack
 Version: 2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: RiceBSD
 Group: Development/Libraries
 URL: http://www.caam.rice.edu/software/ARPACK/
@@ -18,10 +16,15 @@ Patch0: arpack-2.1-redhat.patch
 Patch1: arpack-second-bug.patch
 Patch2: arpack-etime.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-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
+
+# RHEL 4 uses g77 and doesn't have separate lapack-devel package
+%if 0%{?rhel} == 4
+BuildRequires: gcc-g77
+BuildRequires: lapack
+%else
+BuildRequires: gcc-gfortran
+BuildRequires: lapack-devel
+%endif
 
 %description
 ARPACK is a collection of Fortran77 subroutines designed to solve large 
@@ -63,10 +66,16 @@ library and so links used for building a
 mkdir static shared
 
 %build
+%if 0%{?rhel} == 4
+ export FC=g77
+%else
+ export FC=gfortran
+%endif
+
 cd shared
 for dir in ../SRC ../UTIL; do
   make -f $dir/Makefile VPATH=$dir srcdir=$dir \
-       %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags} -fPIC" \
+       FFLAGS="%{optflags} -fPIC" \
        single double complex complex16
 done
 gcc -shared -llapack -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o
@@ -74,8 +83,8 @@ cd ..
 cd static
 for dir in ../SRC ../UTIL; do
   make -f $dir/Makefile VPATH=$dir srcdir=$dir \
-  %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags}" LDFLAGS="-s" \
-       all
+  FFLAGS="%{optflags}" LDFLAGS="-s" \
+  all
 done
 ar rv libarpack.a *.o
 ranlib libarpack.a
@@ -111,6 +120,9 @@ rm -rf %{buildroot}
 %{_libdir}/libarpack.a
 
 %changelog
+* Tue Jan 19 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.1-13
+- Use conditionals based on the distribution version. 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild