From dca674d4c7529314f4e47a9c40757f79854fbd34 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 15 Jun 2012 12:45:12 -0600 Subject: [PATCH 1/3] Update to 3.3.2 Drop alignment patch --- .gitignore | 1 + fftw-3.3.1-alignment.patch | 12 ------------ fftw.spec | 13 ++++++------- sources | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 fftw-3.3.1-alignment.patch diff --git a/.gitignore b/.gitignore index 6edbd11..614f79d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ fftw-3.2.2.tar.gz /fftw-3.3.tar.gz /fftw-3.3.1.tar.gz +/fftw-3.3.2.tar.gz diff --git a/fftw-3.3.1-alignment.patch b/fftw-3.3.1-alignment.patch deleted file mode 100644 index 8ff6f7e..0000000 --- a/fftw-3.3.1-alignment.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up fftw-3.3.1/libbench2/aligned-main.c.orig fftw-3.3.1/libbench2/aligned-main.c ---- fftw-3.3.1/libbench2/aligned-main.c.orig 2012-02-20 18:04:55.000000000 +0200 -+++ fftw-3.3.1/libbench2/aligned-main.c 2012-04-27 10:57:26.832958730 +0300 -@@ -48,7 +48,7 @@ int aligned_main(int argc, char *argv[]) - /* - * Now align the stack pointer - */ -- __asm__ __volatile__ ("andl $-16, %esp"); -+ /* __asm__ __volatile__ ("andl $-16, %esp");*/ - - # ifdef FFTW_DEBUG_ALIGNMENT - /* pessimally align the stack, in order to check whether the diff --git a/fftw.spec b/fftw.spec index 8da9e5d..ff08a80 100644 --- a/fftw.spec +++ b/fftw.spec @@ -1,13 +1,11 @@ Name: fftw -Version: 3.3.1 -Release: 3%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: A Fast Fourier Transform library Group: System Environment/Libraries License: GPLv2+ URL: http://www.fftw.org Source0: http://www.fftw.org/fftw-%{version}.tar.gz -# Patch around gcc 4.7, obtained from upstream -Patch0: fftw-3.3.1-alignment.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # OpenMP support not available on RHEL 4 @@ -140,9 +138,6 @@ library. %prep %setup -q -%if 0%{?fedora} == 17 || 0%{?fedora} == 18 -%patch0 -p1 -b .alignment -%endif %build @@ -298,6 +293,10 @@ fi %{_libdir}/libfftw3*.a %changelog +* Fri Jun 15 2012 Orion Poplawski - 3.3.2-1 +- Update to 3.3.2 +- Drop alignment patch + * Fri Apr 27 2012 Jussi Lehtola - 3.3.1-3 - Fix FTBFS with gcc 4.7. diff --git a/sources b/sources index a1f15b3..e9d63d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76f5f3c7577613d0fbedaae77450ac91 fftw-3.3.1.tar.gz +6977ee770ed68c85698c7168ffa6e178 fftw-3.3.2.tar.gz From 742f891db74bf4ed631de139ea8e0665ba9614af Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 21:14:53 -0500 Subject: [PATCH 2/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- fftw.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fftw.spec b/fftw.spec index ff08a80..3285051 100644 --- a/fftw.spec +++ b/fftw.spec @@ -1,6 +1,6 @@ Name: fftw Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Fast Fourier Transform library Group: System Environment/Libraries License: GPLv2+ @@ -293,6 +293,9 @@ fi %{_libdir}/libfftw3*.a %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jun 15 2012 Orion Poplawski - 3.3.2-1 - Update to 3.3.2 - Drop alignment patch From a9ae98aa211973f498e7b057d0b31049af5d795c Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Mon, 26 Nov 2012 10:22:02 +0200 Subject: [PATCH 3/3] Update to 3.3.3. --- .gitignore | 1 + fftw.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 614f79d..3a1e110 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ fftw-3.2.2.tar.gz /fftw-3.3.tar.gz /fftw-3.3.1.tar.gz /fftw-3.3.2.tar.gz +/fftw-3.3.3.tar.gz diff --git a/fftw.spec b/fftw.spec index 3285051..b937867 100644 --- a/fftw.spec +++ b/fftw.spec @@ -1,6 +1,6 @@ Name: fftw -Version: 3.3.2 -Release: 2%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: A Fast Fourier Transform library Group: System Environment/Libraries License: GPLv2+ @@ -293,6 +293,9 @@ fi %{_libdir}/libfftw3*.a %changelog +* Mon Nov 26 2012 Jussi Lehtola - 3.3.3-1 +- Update to 3.3.3. + * Thu Jul 19 2012 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index e9d63d2..0acdc96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6977ee770ed68c85698c7168ffa6e178 fftw-3.3.2.tar.gz +0a05ca9c7b3bfddc8278e7c40791a1c2 fftw-3.3.3.tar.gz