- updated to 3.1, updated link patch, removed obsolete gcc4 patch

Changed files:
    fftw3.spec -> 1.22

diff --git a/fftw3.spec b/fftw3.spec
index f966cc6c946ae42c2a5ad97b69305b8b06668267..87b5dca5353d5c941d35d76d47459c2e0b512e5b 100644 (file)
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -9,15 +9,14 @@ Summary:      Fast Fourier Transform library
 Summary(pl):   Biblioteka z funkcjami szybkiej transformaty Fouriera
 Summary(pt_BR):        biblioteca fast fourier transform
 Name:          fftw3
-Version:       3.0.1
-Release:       5
+Version:       3.1
+Release:       1
 License:       GPL
 Group:         Libraries
 Source0:       ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz
-# Source0-md5: 76cd21ecc9a7bed6343566c473c36477
+# Source0-md5: 911515569a8abdc7dbb207d53f34e60b
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
-Patch2:                fftw-gcc4.patch
 URL:           http://www.fftw.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -215,11 +214,10 @@ Pliki programistyczne wsp
 %setup -q -n fftw-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 
@@ -235,14 +233,11 @@ for ver in single double %{?with_fftwl:long-double} ; do
        OPTS=""
        # k7,SSE,3dnow,altivec only for single
        if [ "$ver" = "single" ]; then
-%ifarch i586 k6
-               OPTS="--enable-3dnow"
-%endif
 %ifarch i686
                OPTS="--enable-sse"
 %endif
 %ifarch athlon
-               OPTS="--enable-sse" # "--enable-k7" disabled - causes SEGV on athlons
+               OPTS="--enable-sse" # no "--enable-k7" - conflicts with shared, SEGV on athlons
 %endif
 %ifarch ppc
                OPTS="--enable-altivec"