X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffftw3.git;a=blobdiff_plain;f=fftw3.spec;h=d1995c3fe7af69b34b0a9777133da0dc2d228adc;hp=c48ee6db4ead4bb9a520298578cc583628e83717;hb=2b81a55c2403554c398e52890fc9d28f88b24ed8;hpb=bf578b0618ae7108c5c52bf1b104314a297d9257

diff --git a/fftw3.spec b/fftw3.spec
index c48ee6d..d1995c3 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -1,27 +1,30 @@
 #
+# Conditional build:
 %bcond_without	fftwl	# don't build "long" subpackages
 #
-%ifarch alpha ppc sparc
-# sizeof(double long)==sizeof(double) on these archs
-%undefine	with_fftwl
-%endif
 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:	4
+Version:	3.1.1
+Release:	1
 License:	GPL
 Group:		Libraries
 Source0:	ftp://ftp.fftw.org/pub/fftw/fftw-%{version}.tar.gz
-# Source0-md5:	76cd21ecc9a7bed6343566c473c36477
+# Source0-md5:	b35813b88a046e4e74a603017794ddcd
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link.patch
-Icon:		fftw-logo-thumb.gif
+Patch2:		%{name}-ac_simd.patch
 URL:		http://www.fftw.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gcc-g77
+%ifarch alpha ppc s390 s390x sparc sparcv9
+%if %{with fftwl}
+# for 128-bit long double support
+BuildRequires:	gcc-fortran >= 5:4.1.0-1
+BuildRequires:	glibc >= 6:2.4-1
+%endif
+%endif
 BuildRequires:	libtool
 BuildRequires:	texinfo
 Requires:	%{name}-common = %{version}-%{release}
@@ -215,14 +218,16 @@ Pliki programistyczne wsp
 %setup -q -n fftw-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 
 # prepare three trees (for single, double, long-double precision)
+rm -rf single double long-double
 echo * > files.list
 install -d single long-double
 cp -a `cat files.list` single
@@ -230,18 +235,15 @@ cp -a `cat files.list` long-double
 ln -sf . double
 
 # MMX/SSE/etc. seem to be safe because of runtime CPU detection
-for ver in single double %{?with_fftwl:long-double} ; do
+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"
@@ -279,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with fftwl}
-%{__make} install -C long-double\
+%{__make} install -C long-double \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif