X-Git-Url: https://git.pld-linux.org/?p=packages%2Fframewave.git;a=blobdiff_plain;f=framewave.spec;h=e3dc3e8d9b9e24b79465676aff26831e176da073;hp=a5d39c56464b1f4c1a2dc24ffc6d3acd96c9a53e;hb=2a9d8e7;hpb=094e48e874184033e474f87174ec5c694de50356

diff --git a/framewave.spec b/framewave.spec
index a5d39c5..e3dc3e8 100644
--- a/framewave.spec
+++ b/framewave.spec
@@ -6,20 +6,24 @@ Summary:	Framewave - set of popular image and signal processing routines
 Summary(pl.UTF-8):	Framewave - zestaw popularnych funkcji do przetwarzania obrazu i sygnału
 Name:		framewave
 Version:	1.3.1
-Release:	4
+Release:	14
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/framewave/FRAMEWAVE_%{version}_SRC.tar.gz
 # Source0-md5:	86a28ebfbfd70be06ab54d0d8b17ebd7
 Patch0:		%{name}-system-boost.patch
 Patch1:		%{name}-c++.patch
+Patch2:		no-forced-arch-bits.patch
+Patch3:		%{name}-templates.patch
+Patch4:		%{name}-warnings.patch
+Patch5:		%{name}-cpuid.patch
 URL:		http://framewave.sourceforge.net/
 BuildRequires:	boost-devel >= 1.34
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.385
 BuildRequires:	scons
 BuildRequires:	sed >= 4.0
-ExclusiveArch:	%{ix86} %{x8664}
+ExclusiveArch:	%{ix86} %{x8664} x32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,6 +70,10 @@ Statyczne biblioteki Framewave.
 %setup -q -n FRAMEWAVE_%{version}_SRC
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # kill precompiled binaries
 %{__rm} BuildTools/bin/FwHeaderConvert_*
@@ -77,7 +85,7 @@ cd Framewave
 mkdir -p build/{include,tmp,bin}
 for kind in shared %{?with_static_libs:static} ; do
 %scons \
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 	bitness=64 \
 %else
 	bitness=32 \