[opencv/f15] Fix for ARM (attempt)

[Nicolas Chauvet]

commit 1ecaee7ede5b7177998320a63d07d8fcaefcf0df
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Jan 13 10:40:10 2012 +0100

    Fix for ARM (attempt)

 OpenCV-2.2-gcc46.patch |   13 ++++++++++++-
 opencv.spec            |    5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/OpenCV-2.2-gcc46.patch b/OpenCV-2.2-gcc46.patch
index c1ed29b..8f71039 100644
--- a/OpenCV-2.2-gcc46.patch
+++ b/OpenCV-2.2-gcc46.patch
@@ -1,6 +1,6 @@
 diff -up OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp.gcc46 OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp
 --- OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp.gcc46	2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp	2011-02-02 16:44:02.177243993 +0100
++++ OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp	2012-01-13 10:21:20.649317440 +0100
 @@ -52,6 +52,7 @@
  #ifdef __cplusplus
  
@@ -9,3 +9,14 @@ diff -up OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp.gcc46 OpenCV-2.
  #include <limits.h>
  #include <algorithm>
  #include <cmath>
+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 fdf298d..190ba70 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -4,7 +4,7 @@
 
 Name:           opencv
 Version:        2.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 13 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-7
+- Fix for ARM build
+
 * Thu May 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-6
 - Backport fixes from branch 2.2 to date