[cpl] Using system fftw libraries

[Sergio Pascual]

commit 3963afdc5c0da73a3d63143757e171b3b2ed54d6
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Wed Jan 18 19:37:04 2012 +0100

    Using system fftw libraries

 cpl-fftwdyn.patch |   25 +++++++++++++++++++++++++
 cpl.spec          |   16 ++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)
---
diff --git a/cpl-fftwdyn.patch b/cpl-fftwdyn.patch
new file mode 100644
index 0000000..d5da917
--- /dev/null
+++ b/cpl-fftwdyn.patch
@@ -0,0 +1,25 @@
+diff -ur cpl-5.3.1/configure cpl-5.3.1.fftw/configure
+--- cpl-5.3.1/configure	2012-01-18 18:56:56.482524970 +0100
++++ cpl-5.3.1.fftw/configure	2012-01-18 19:01:45.098006700 +0100
+@@ -12870,8 +12870,8 @@
+ 
+     cpl_fftw_check_header="fftw3.h"
+     cpl_fftwf_check_header="fftw3.h"
+-    cpl_fftw_check_lib="libfftw3.a"
+-    cpl_fftwf_check_lib="libfftw3f.a"
++    cpl_fftw_check_lib="libfftw3.so"
++    cpl_fftwf_check_lib="libfftw3f.so"
+ 
+     cpl_fftw_includes=""
+     cpl_fftwf_includes=""
+@@ -12895,8 +12895,10 @@
+         cpl_fftw_incdirs="$cpl_with_fftw_includes"
+     fi
+ 
++    cpl_fftw_incdirs="$includedir"
+     cpl_fftw_includes=no
+ 
++    cpl_fftw_libdirs="$libdir"
+     for i in $cpl_fftw_incdirs; do
+         for j in $cpl_fftw_check_header; do
+ 
diff --git a/cpl.spec b/cpl.spec
index f908ed3..35fd116 100644
--- a/cpl.spec
+++ b/cpl.spec
@@ -1,6 +1,6 @@
 Name: cpl
 Version: 5.3.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -10,8 +10,9 @@ Source0: ftp://ftp.eso.org/pub/cpl/%{name}-%{version}.tar.gz
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
 Patch1: cpl-wcslibdyn.patch
+Patch2: cpl-fftwdyn.patch
 
-BuildRequires: cfitsio-devel wcslib-devel
+BuildRequires: cfitsio-devel wcslib-devel fftw-devel
 
 %description
 The Common Pipeline Library (CPL) comprises a set of ISO-C libraries 
@@ -34,6 +35,7 @@ application
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static
@@ -46,27 +48,25 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING NEWS
 %{_libdir}/*so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc README
 %{_libdir}/*.so
 %{_includedir}/*
 %exclude %{_libdir}/*.la
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-2
+* Wed Jan 18 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 5.3.1-4
+- Using system fftw libraries
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Wed Aug 24 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 5.3.1-2