- rel 7; add arscnd patch (symbol collision)

Changed files:
    arpack-automake_support.patch -> 1.7
    arpack-no_etime.patch -> 1.2
    arpack.spec -> 1.25

diff --git a/arpack-automake_support.patch b/arpack-automake_support.patch
index 1599e80e3cb6976d262e7ac79eec9de193566e20..c1211b1f1c22f5b5faeeeeca85a875cd5838fd5d 100644 (file)
--- a/arpack-automake_support.patch
+++ b/arpack-automake_support.patch
@@ -41,7 +41,7 @@ diff -urN ARPACK.orig/SRC/Makefile.am ARPACK.patch/SRC/Makefile.am
 +       zngets.f zsortc.f zstatn.f\
 +       ../UTIL/cmout.f ../UTIL/cvout.f ../UTIL/dmout.f ../UTIL/dvout.f\
 +       ../UTIL/icnteq.f ../UTIL/icopy.f ../UTIL/iset.f ../UTIL/iswap.f\
-+       ../UTIL/ivout.f ../UTIL/second.f ../UTIL/smout.f ../UTIL/svout.f\
++       ../UTIL/ivout.f ../UTIL/arscnd.f ../UTIL/smout.f ../UTIL/svout.f\
 +       ../UTIL/zmout.f ../UTIL/zvout.f \
 +      ../LAPACK/cgbtf2.f  ../LAPACK/dlarf.f   ../LAPACK/slarf.f \
 +      ../LAPACK/cgbtrf.f  ../LAPACK/dlarfg.f  ../LAPACK/slarfg.f \

diff --git a/arpack-no_etime.patch b/arpack-no_etime.patch
index c7dc75ab3860dcda5681f97340b8678b4c2ba01e..6a7c3e110df6dc25630215af3b7dce6d554eb98d 100644 (file)
--- a/arpack-no_etime.patch
+++ b/arpack-no_etime.patch
@@ -1,5 +1,5 @@
---- ARPACK/UTIL/second.f.orig  2007-12-21 13:26:26.355426337 +0100
-+++ ARPACK/UTIL/second.f       2007-12-21 13:26:40.853214608 +0100
+--- ARPACK/UTIL/arscnd.f.orig  2007-12-21 13:26:26.355426337 +0100
++++ ARPACK/UTIL/arscnd.f       2007-12-21 13:26:40.853214608 +0100
 @@ -19,7 +19,7 @@
  *     ..
  *     .. External Functions ..

diff --git a/arpack.spec b/arpack.spec
index 882197da7cfecbf76681e57860bcb4a4cafc232c..b290d388f02714eadafca8d016a9c1ece07736a5 100644 (file)
--- a/arpack.spec
+++ b/arpack.spec
@@ -6,7 +6,7 @@ Summary:        Subroutines for solving large scale eigenvalue problems
 Summary(pl.UTF-8):     Rozwiązywanie zagadnienia własnego dla dużych macierzy
 Name:          arpack
 Version:       2.1
-Release:       6%{?with_acml:ACML}
+Release:       7%{?with_acml:ACML}
 License:       Freely distributable
 Group:         Libraries
 Source0:       http://www.caam.rice.edu/software/ARPACK/SRC/%{name}96.tar.gz
@@ -19,8 +19,9 @@ Source3:      http://www.caam.rice.edu/software/ARPACK/SRC/P57_58.ps.gz
 # Source3-md5: b86d77199f989fc438acaf7ac0433e76
 Source4:       http://www.caam.rice.edu/software/ARPACK/SRC/P61_62.ps.gz
 # Source4-md5: d116887acb3d61fecf645c2d37d4d517
-Patch0:                %{name}-automake_support.patch
-Patch1:                %{name}-no_etime.patch
+Patch0:                http://mathema.tician.de/news.tiker.net/files/arpack-arscnd-3.patch.gz
+Patch1:                %{name}-automake_support.patch
+Patch2:                %{name}-no_etime.patch
 URL:           http://www.caam.rice.edu/software/ARPACK/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -80,6 +81,7 @@ Statyczna biblioteka ARPACK.
 %setup -q -n ARPACK -b1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp %{SOURCE2} .
 cp %{SOURCE3} .
 cp %{SOURCE4} .