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

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/arpack/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4266

Modified Files:
	arpack.spec 
Log Message:
Clean up buildrequires, fix update path.


Index: arpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arpack/EL-6/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	7 Jul 2010 17:53:43 -0000	1.7
@@ -1,27 +1,20 @@
-%bcond_without gfortran
-
 Summary: Fortran77 subroutines for solving large scale eigenvalue problems
 Name: arpack
 Version: 2.1
-Release: 12%{?dist}
-License: RiceBSD
+Release: 13%{?dist}
+License: BSD
 Group: Development/Libraries
 URL: http://www.caam.rice.edu/software/ARPACK/
 Source0: http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz
 Source1: http://www.caam.rice.edu/software/ARPACK/SRC/patch.tar.gz
-Source2: http://www.caam.rice.edu/software/ARPACK/RiceBSD.doc
-Source3: RiceBSD.txt
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=148107
-Source4: clarification-note-by-authors.txt
+Source2: http://www.caam.rice.edu/software/ARPACK/RiceBSD.txt
 Patch0: arpack-2.1-redhat.patch
 # see http://www.ann.jussieu.fr/pipermail/freefempp/2006/000213.html
 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
+BuildRequires: gcc-gfortran
+BuildRequires: lapack-devel
 
 %description
 ARPACK is a collection of Fortran77 subroutines designed to solve large 
@@ -66,7 +59,7 @@ mkdir static shared
 cd shared
 for dir in ../SRC ../UTIL; do
   make -f $dir/Makefile VPATH=$dir srcdir=$dir \
-       %{?with_gfortran:FC=gfortran} FFLAGS="%{optflags} -fPIC" \
+       FC=gfortran FFLAGS="%{optflags} -fPIC" \
        single double complex complex16
 done
 gcc -shared -llapack -Wl,-soname,libarpack.so.2 -o libarpack.so.2.1 *.o
@@ -74,7 +67,7 @@ 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" \
+       FC=gfortran FFLAGS="%{optflags}" LDFLAGS="-s" \
        all
 done
 ar rv libarpack.a *.o
@@ -88,7 +81,7 @@ install -p -m644 static/libarpack.a %{bu
 install -p -m755 shared/libarpack.so.2.1 %{buildroot}%{_libdir}
 ln -s libarpack.so.2.1 %{buildroot}%{_libdir}/libarpack.so.2
 ln -s libarpack.so.2 %{buildroot}%{_libdir}/libarpack.so
-cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+cp -p %{SOURCE2} .
 
 %clean
 rm -rf %{buildroot}
@@ -99,7 +92,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc RiceBSD.doc clarification-note-by-authors.txt
+%doc RiceBSD.txt
 %{_libdir}/libarpack.so.*
 
 %files devel
@@ -111,11 +104,13 @@ rm -rf %{buildroot}
 %{_libdir}/libarpack.a
 
 %changelog
-* 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
+* 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.
+- Bump spec to fix update path.
 
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Apr  7 2010 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.1-11
+- Change license to BSD (see RH bugs #234191 and #578873).
 
 * Wed Sep 24 2008 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 2.1-10
 - fix libarpack.so: undefined reference to `etime_' with recent gfortran