X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fftw3.spec;h=1f2ec0ba9de5d3e48b090e2af18ef20d4d8667c4;hb=HEAD;hp=7a206aa74de48522d883c693e5011f116506b866;hpb=1a4cbeb73c12fe31d148a540fb32587a6b171a93;p=packages%2Ffftw3.git

diff --git a/fftw3.spec b/fftw3.spec
index 7a206aa..0f943d1 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -13,18 +13,26 @@
 %bcond_with	avx256		# AVX2 256-bit FMA instructions
 %bcond_with	avx512		# AVX512 and KCVI [experimental]
 #
+
+%ifnarch %{ix86} %{x8664} x32 ia64
+%undefine	with_fftwq
+%endif
+
 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.3.7
-Release:	1
+Version:	3.3.10
+Release:	2
 License:	GPL v2+
 Group:		Libraries
 #Source0Download: http://fftw.org/download.html
 Source0:	http://fftw.org/fftw-%{version}.tar.gz
-# Source0-md5:	0d5915d7d39b3253c1cc05030d79ac47
+# Source0-md5:	8ccbf6a5ea78a16dbc3e1306e234cc5c
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-flags.patch
+Patch2:		fftw-cmake.patch
+Patch3:		fftw-cmakedir.patch
 URL:		http://www.fftw.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.7
@@ -292,6 +300,9 @@ Pliki programistyczne wspólne dla wszystkich wersji bibliotek fftw
 %prep
 %setup -q -n fftw-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -308,7 +319,7 @@ for ver in %{builds}; do
 		# for SSE2-aware subarchs SSE for single precision is enabled by --enable-sse2 option
 		OPTS="--enable-sse"
 %endif
-%ifarch %{arm} aarch64
+%ifarch armv7l armv7hl armv7hnl armv8l armv8hl armv8hnl armv8hcnl aarch64
 		OPTS="--enable-neon"
 %endif
 %ifarch ppc ppc64
@@ -402,7 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfftw3_omp.la
 %endif
 %{_pkgconfigdir}/fftw3.pc
-%{_libdir}/cmake/fftw3/FFTW3Config*.cmake
+%{_libdir}/cmake/fftw3
 
 %files static
 %defattr(644,root,root,755)
@@ -436,7 +447,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfftw3f_omp.la
 %endif
 %{_pkgconfigdir}/fftw3f.pc
-%{_libdir}/cmake/fftw3/FFTW3fConfig*.cmake
+%{_libdir}/cmake/fftw3f
 
 %files single-static
 %defattr(644,root,root,755)
@@ -472,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_includedir}/fftw3l.f03
 %{_pkgconfigdir}/fftw3l.pc
-%{_libdir}/cmake/fftw3/FFTW3lConfig*.cmake
+%{_libdir}/cmake/fftw3l
 
 %files long-static
 %defattr(644,root,root,755)
@@ -509,7 +520,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_includedir}/fftw3q.f03
 %{_pkgconfigdir}/fftw3q.pc
-%{_libdir}/cmake/fftw3/FFTW3qConfig*.cmake
+%{_libdir}/cmake/fftw3q
 
 %files quad-static
 %defattr(644,root,root,755)
@@ -533,5 +544,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/fftw3.f
 %{_includedir}/fftw3.f03
 %{_includedir}/fftw3.h
-%dir %{_libdir}/cmake/fftw3
 %{_infodir}/fftw3.info*