Accepting request 232657 from multimedia:libs

Mention a dropped patch in changelog
- Drop obsoleted 1_man_macro.patch (forwarded request 232656 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/232657
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fftw3?expand=0&rev=32

1_man_macro.patch

@@ -1,22 +0,0 @@
---- tools/fftw_wisdom.1.in.orig	2012-03-06 05:13:17.206776451 -0500
-+++ tools/fftw_wisdom.1.in	2012-03-06 05:13:36.249716254 -0500
-@@ -24,7 +24,7 @@
- [\fIOPTION\fR]... [\fISIZE\fR]...
- .SH DESCRIPTION
- .PP
--." Add any additional description here
-+.\" Add any additional description here
- .I fftw@PREC_SUFFIX@-wisdom
- is a utility to generate FFTW
- .B wisdom
---- tools/fftw-wisdom-to-conf.1.orig	2012-03-06 05:15:51.265301506 -0500
-+++ tools/fftw-wisdom-to-conf.1	2012-03-06 05:16:03.991269669 -0500
-@@ -23,7 +23,7 @@
- \fBfftw-wisdom-to-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR]
- .SH DESCRIPTION
- .PP
--." Add any additional description here
-+.\" Add any additional description here
- .I fftw-wisdom-to-conf
- is a utility to generate C
- .B configuration

fftw-3.3.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3
-size 3920661

fftw-3.3.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982
+size 3940427

fftw3.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sat Apr 19 19:16:23 UTC 2014 - mardnh@gmx.de
+
+- add support for long-double precision
+
+-------------------------------------------------------------------
+Sat Apr 19 17:37:38 UTC 2014 - mardnh@gmx.de
+
+- update to version 3.3.4
+  
+  * New functions fftw_alignment_of (to check whether two arrays are equally
+    aligned for the purposes of applying a plan) and fftw_sprint_plan
+    (to output a description of plan to a string).
+
+  * Bugfix in fftw-wisdom-to-conf; thanks to Florian Oppermann for the bug report.
+
+  * Fixed manual to work with texinfo-5.
+
+  * Increased timing interval on x86_64 to reduce timing errors.
+
+  * Default to Win32 threads, not pthreads, if both are present.
+
+  * Various build-script fixes. 
+
+- Drop obsoleted 1_man_macro.patch
+
 -------------------------------------------------------------------
 Sun Dec 16 19:26:48 UTC 2012 - dhall@wustl.edu
 

fftw3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fftw3
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@ BuildRequires:  pkgconfig
 %ifnarch s390 s390x
 BuildRequires:  openmpi-devel
 %endif
-Version:        3.3.3
+Version:        3.3.4
 Release:        0
 Summary:        Discrete Fourier Transform (DFT) C Subroutine Library
 License:        GPL-2.0+
@@ -31,7 +31,6 @@ Group:          Productivity/Scientific/Math
 Url:            http://www.fftw.org
 Source:         http://www.fftw.org/fftw-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
-Patch0:         1_man_macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(pre):  %install_info_prereq
 
@@ -146,7 +145,6 @@ data, and of arbitrary input size.
 
 %prep
 %setup -q -n fftw-%{version}
-%patch0
 
 %build
 %ifnarch s390 s390x
@@ -180,7 +178,22 @@ source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
   --enable-mpi \
 %endif
 %ifarch %ix86 x86_64
-  --enable-sse \
+  --enable-sse2 \
+%endif
+  --disable-static
+
+make %{?_smp_mflags}
+%makeinstall
+
+# hack to also compile/install long-double-precision version:
+make distclean
+
+%ifnarch s390 s390x
+source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
+%endif
+%configure --enable-shared --enable-threads --enable-long-double --enable-openmp \
+%ifnarch s390 s390x
+  --enable-mpi \
 %endif
   --disable-static
 
@@ -227,6 +240,7 @@ find doc -name 'Makefile*' | xargs rm
 %defattr(-,root,root)
 %{_libdir}/libfftw3.so.3*
 %{_libdir}/libfftw3f.so.3*
+%{_libdir}/libfftw3l.so.3*
 
 %files devel
 %defattr(-,root,root)
@@ -239,6 +253,7 @@ find doc -name 'Makefile*' | xargs rm
 %{_includedir}/fftw3l.f03
 %{_libdir}/libfftw3.so
 %{_libdir}/libfftw3f.so
+%{_libdir}/libfftw3l.so
 %{_libdir}/pkgconfig/*.pc
 %{_bindir}/*
 
@@ -246,21 +261,25 @@ find doc -name 'Makefile*' | xargs rm
 %defattr(-,root,root)
 %{_libdir}/libfftw3_threads.so.3*
 %{_libdir}/libfftw3f_threads.so.3*
+%{_libdir}/libfftw3l_threads.so.3*
 
 %files threads-devel
 %defattr(-,root,root)
 %{_libdir}/libfftw3_threads.so
 %{_libdir}/libfftw3f_threads.so
+%{_libdir}/libfftw3l_threads.so
 
 %files -n libfftw3_omp3
 %defattr(-,root,root)
 %{_libdir}/libfftw3_omp.so.3*
 %{_libdir}/libfftw3f_omp.so.3*
+%{_libdir}/libfftw3l_omp.so.3*
 
 %files openmp-devel
 %defattr(-,root,root)
 %{_libdir}/libfftw3_omp.so
 %{_libdir}/libfftw3f_omp.so
+%{_libdir}/libfftw3l_omp.so
 
 %ifnarch s390 s390x
 
@@ -268,13 +287,16 @@ find doc -name 'Makefile*' | xargs rm
 %defattr(-,root,root)
 %{_libdir}/libfftw3_mpi.so.3*
 %{_libdir}/libfftw3f_mpi.so.3*
+%{_libdir}/libfftw3l_mpi.so.3*
 
 %files mpi-devel
 %defattr(-,root,root)
 %{_libdir}/libfftw3_mpi.so
 %{_libdir}/libfftw3f_mpi.so
+%{_libdir}/libfftw3l_mpi.so
 %{_includedir}/fftw3-mpi.*
 %{_includedir}/fftw3l-mpi.f03
+%{_includedir}/fftw3l-mpi.f03
 %endif
 
 %changelog