[rpms/opencv] opencv5: Update gcc46 patch for ARM case

[rpms/opencv] opencv5: Update gcc46 patch for ARM case

[Nicolas Chauvet]

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 74300b34324da2eeb2d9b2c80562598d191ae513
Author : Nicolas Chauvet <kwizart@gmail.com>
Date   : 2012-01-16T15:08:05+01:00
Stats  : +17/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/74300b34324da2eeb2d9b2c80562598d191ae513?branch=opencv5

Log:
Update gcc46 patch for ARM case

---
diff --git a/OpenCV-2.2-gcc46.patch b/OpenCV-2.2-gcc46.patch
new file mode 100644
index 0000000..e051900
--- /dev/null
+++ b/OpenCV-2.2-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up OpenCV-2.2.0/modules/ml/src/gbt.cpp.gcc46 OpenCV-2.2.0/modules/ml/src/gbt.cpp
+--- OpenCV-2.2.0/modules/ml/src/gbt.cpp.gcc46	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/modules/ml/src/gbt.cpp	2012-01-13 10:35:49.724487556 +0100
+@@ -1,6 +1,7 @@
+ 
+ #include "precomp.hpp"
+ #include <string>
++#include <math.h>
+ #include <time.h>
+ 
+ using namespace std;

diff --git a/opencv.spec b/opencv.spec
index 2d210bc..306b2f2 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -5,7 +5,7 @@
 
 Name:           opencv
 Version:        2.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ Source0:        http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{v
 Source1:        opencv-samples-Makefile
 Patch0:         OpenCV-2.3.1-numpy.patch
 Patch1:         OpenCV-2.3.1-opencvconfig.patch
+Patch2:         OpenCV-2.2-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -97,6 +98,7 @@ This package contains Python bindings for the OpenCV library.
 %setup -q -n %{tar_name}-%{version}
 %patch0 -p1 -b .numpy
 %patch1 -p1 -b .opencvconfig
+%patch2 -p1 -b .gcc46
 
 # fix dos end of lines
 sed -i 's|\r||g'  samples/c/adaptiveskindetector.cpp
@@ -215,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 16 2012 Nicolas Chauvet <kwizart@gmail.com> - 2.3.1-7
+- Update gcc46 patch for ARM FTBFS
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild