- updated to 3.2.2

- updated link patch, removed obsolete chk patch

Changed files:
    fftw3-chk.patch -> 1.2
    fftw3-link.patch -> 1.4
    fftw3.spec -> 1.41

diff --git a/fftw3-chk.patch b/fftw3-chk.patch
deleted file mode 100644 (file)
index d2fbf89..0000000
--- a/fftw3-chk.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- fftw-3.2/libbench2/report.c.orig   2006-12-08 19:40:41.000000000 +0100
-+++ fftw-3.2/libbench2/report.c        2008-12-01 18:21:51.300291979 +0100
-@@ -93,20 +93,24 @@
- static void sprintf_time(double x, char *buf, int buflen)
- {
- #ifdef HAVE_SNPRINTF
--#  define BENCH_BUFARG buf, buflen
-+     if (x < 1.0E-6)
-+        snprintf(buf, buflen, "%.2f ns", x * 1.0E9);
-+     else if (x < 1.0E-3)
-+        snprintf(buf, buflen, "%.2f us", x * 1.0E6);
-+     else if (x < 1.0)
-+        snprintf(buf, buflen, "%.2f ms", x * 1.0E3);
-+     else
-+        snprintf(buf, buflen, "%.2f s", x);
- #else
--#  define snprintf sprintf
--#  define BENCH_BUFARG buf
--#endif
-      if (x < 1.0E-6)
--        snprintf(BENCH_BUFARG, "%.2f ns", x * 1.0E9);
-+        sprintf(buf, "%.2f ns", x * 1.0E9);
-      else if (x < 1.0E-3)
--        snprintf(BENCH_BUFARG, "%.2f us", x * 1.0E6);
-+        sprintf(buf, "%.2f us", x * 1.0E6);
-      else if (x < 1.0)
--        snprintf(BENCH_BUFARG, "%.2f ms", x * 1.0E3);
-+        sprintf(buf, "%.2f ms", x * 1.0E3);
-      else
--        snprintf(BENCH_BUFARG, "%.2f s", x);
--#undef BENCH_BUFARG
-+        sprintf(buf, "%.2f s", x);
-+#endif
- }
- 
- void report_verbose(const bench_problem *p, double *t, int st)

diff --git a/fftw3-link.patch b/fftw3-link.patch
index f45dcb6bbc7d70d47eff68ad2a788006d1de3b55..86b3b80878749720a6852a4c7271956cc21d7250 100644 (file)
--- a/fftw3-link.patch
+++ b/fftw3-link.patch
@@ -5,16 +5,16 @@
  
  libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
 +libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(top_builddir)/libfftw3@PREC_SUFFIX@.la -lpthread
---- fftw-3.1/Makefile.am.orig  2006-01-28 01:16:28.000000000 +0100
-+++ fftw-3.1/Makefile.am       2006-01-31 22:18:47.468155000 +0100
-@@ -10,8 +10,8 @@
+--- fftw-3.2.2/Makefile.am.orig        2009-07-12 12:35:49.000000000 +0200
++++ fftw-3.2.2/Makefile.am     2010-10-14 09:20:15.323741882 +0200
+@@ -13,8 +13,8 @@
  
- ACLOCAL_AMFLAGS=-I ./m4
+ ACLOCAL_AMFLAGS=-I m4
  
 -SUBDIRS=support $(GENFFT) kernel simd dft rdft reodft api threads \
--cell libbench2 . tests doc tools
+-cell libbench2 . tests doc tools m4
 +SUBDIRS=support $(GENFFT) kernel simd dft rdft reodft api . threads \
-+cell libbench2 tests doc tools
- EXTRA_DIST=COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in m4   \
- README.Cell
++cell libbench2 tests doc tools m4
+ EXTRA_DIST=COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in README.Cell
  
+ if HAVE_SIMD

diff --git a/fftw3.spec b/fftw3.spec
index 3b9310658b8fcd98ff13574a3c2c6e30fc552876..4bba1e4f62d0f870a1f6612c4c97eb49e60b7736 100644 (file)
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -6,16 +6,15 @@ Summary:      Fast Fourier Transform library
 Summary(pl.UTF-8):     Biblioteka z funkcjami szybkiej transformaty Fouriera
 Summary(pt_BR.UTF-8):  biblioteca fast fourier transform
 Name:          fftw3
-Version:       3.2
-Release:       2
+Version:       3.2.2
+Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz
-# Source0-md5: 280960ddbad368ebb96c073a2b642f5d
+# Source0-md5: b616e5c91218cc778b5aa735fefb61ae
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-ac_simd.patch
-Patch3:                %{name}-chk.patch
 URL:           http://www.fftw.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -220,7 +219,6 @@ Pliki programistyczne wspólne dla wszystkich wersji bibliotek fftw
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -292,10 +290,10 @@ rm -rf $RPM_BUILD_ROOT
 %post  long -p /sbin/ldconfig
 %postun        long -p /sbin/ldconfig
 
-%post common-devel     -p      /sbin/postshell
+%post  common-devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun common-devel   -p      /sbin/postshell
+%postun        common-devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files