- updated patches set for python 3/scons 4

[packages/framewave.git] / framewave.spec

diff --git a/framewave.spec b/framewave.spec
index a1a01619bc21b8bcde6d107c6dd6cdd106b132ed..76bf10a81a0edccee9cc4e3ffc92de5a0d1961b3 100644 (file)
--- a/framewave.spec
+++ b/framewave.spec
@@ -1,25 +1,34 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static libraries
+%bcond_without static_libs     # static libraries
 #
 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:       3
+Release:       18
 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
+Patch6:                %{name}-scons.patch
+Patch7:                %{name}-opt.patch
+Patch8:                gcc11.patch
+Patch9:                %{name}-python-tabs.patch
+Patch10:       %{name}-python-update.patch
 URL:           http://framewave.sourceforge.net/
 BuildRequires: boost-devel >= 1.34
 BuildRequires: libstdc++-devel
 BuildRequires: rpmbuild(macros) >= 1.385
-BuildRequires: scons
+BuildRequires: scons >= 0.98
 BuildRequires: sed >= 4.0
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,18 +75,27 @@ Statyczne biblioteki Framewave.
 %setup -q -n FRAMEWAVE_%{version}_SRC
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 # kill precompiled binaries
 %{__rm} BuildTools/bin/FwHeaderConvert_*
 
-%{__sed} -i -e "s/'-O2'/'%{rpmcxxflags}'/" BuildTools/buildscripts/fwflags_gcc.py
+%{__sed} -i -e "s/'-O2'/'%{rpmcxxflags} -std=c++11'/" BuildTools/buildscripts/fwflags_gcc.py
 
 %build
 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 \