From 3b2f2d33a9ba57c6356258c0a182d034a92d02f9 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Thu, 3 Jul 2014 13:45:27 +0200
Subject: [PATCH] Update to 2.4.9 - rhbz#1114377

---
 .gitignore                   |  1 +
 opencv-2.4.7-ts_static.patch | 12 ------------
 opencv-2.4.9-ts_static.patch | 12 ++++++++++++
 opencv.spec                  | 18 +++++++++++-------
 sources                      |  2 +-
 5 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 opencv-2.4.7-ts_static.patch
 create mode 100644 opencv-2.4.9-ts_static.patch

diff --git a/.gitignore b/.gitignore
index 80aeb25..84f1e27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ OpenCV-2.1.0.tar.bz2
 /opencv-2.4.5-clean.tar.xz
 /opencv-clean-2.4.6.1.tar.xz
 /opencv-clean-2.4.7.tar.xz
+/opencv-clean-2.4.9.tar.xz
diff --git a/opencv-2.4.7-ts_static.patch b/opencv-2.4.7-ts_static.patch
deleted file mode 100644
index 099a2bf..0000000
--- a/opencv-2.4.7-ts_static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up opencv-2.4.7/modules/ts/CMakeLists.txt.ts_static opencv-2.4.7/modules/ts/CMakeLists.txt
---- opencv-2.4.7/modules/ts/CMakeLists.txt.ts_static	2013-11-06 15:26:39.000000000 +0100
-+++ opencv-2.4.7/modules/ts/CMakeLists.txt	2013-11-14 21:28:28.289051531 +0100
-@@ -4,7 +4,7 @@ if(IOS)
-   ocv_module_disable(ts)
- endif()
- 
--set(OPENCV_MODULE_TYPE STATIC)
-+#set(OPENCV_MODULE_TYPE STATIC)
- set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
- 
- if(HAVE_CUDA)
diff --git a/opencv-2.4.9-ts_static.patch b/opencv-2.4.9-ts_static.patch
new file mode 100644
index 0000000..f1b1c81
--- /dev/null
+++ b/opencv-2.4.9-ts_static.patch
@@ -0,0 +1,12 @@
+diff -up opencv-2.4.9/modules/ts/CMakeLists.txt.ts_static opencv-2.4.9/modules/ts/CMakeLists.txt
+--- opencv-2.4.9/modules/ts/CMakeLists.txt.ts_static	2014-04-11 05:15:26.000000000 -0500
++++ opencv-2.4.9/modules/ts/CMakeLists.txt	2014-06-29 12:49:29.473910506 -0500
+@@ -4,7 +4,7 @@ if(IOS)
+   ocv_module_disable(ts)
+ endif()
+ 
+-set(OPENCV_MODULE_TYPE STATIC)
++#set(OPENCV_MODULE_TYPE STATIC)
+ set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
+ 
+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
diff --git a/opencv.spec b/opencv.spec
index 1b9b55f..3e8a1c3 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -1,25 +1,25 @@
 #global indice   a
 
 Name:           opencv
-Version:        2.4.7
-Release:        7%{?dist}
+Version:        2.4.9
+Release:        1%{?dist}
 Summary:        Collection of algorithms for computer vision
 Group:          Development/Libraries
 # This is normal three clause BSD.
 License:        BSD
 URL:            http://opencv.org
 # Need to remove SIFT/SURF from source tarball, due to legal concerns
-# rm -rf opencv-%%{version}/modules/nonfree/src/sift.cpp
-# rm -rf opencv-%%{version}/modules/nonfree/src/surf.cpp
+# rm -f opencv-%%{version}/modules/nonfree/src/sift.cpp
+# rm -f opencv-%%{version}/modules/nonfree/src/surf.cpp
 # Removed because we don't use pre-built contribs
 # rm -rf 3rdparty
-#Source0:        http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.tar.gz
+#Source0:        http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.zip
 Source0:	%{name}-clean-%{version}%{?indice}.tar.xz
 Source1:        opencv-samples-Makefile
 Patch0:         opencv-pkgcmake.patch
 #http://code.opencv.org/issues/2720
 Patch2:         OpenCV-2.4.4-pillow.patch
-Patch3:         opencv-2.4.7-ts_static.patch
+Patch3:         opencv-2.4.9-ts_static.patch
 # fix/simplify cmake config install location (upstreamable)
 # https://bugzilla.redhat.com/1031312
 Patch4:         opencv-2.4.7-cmake_paths.patch
@@ -133,6 +133,7 @@ pushd build
 %cmake CMAKE_VERBOSE=1 \
  -DPYTHON_PACKAGES_PATH=%{python_sitearch} \
  -DCMAKE_SKIP_RPATH=ON \
+ -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \
 %ifnarch x86_64 ia64
  -DENABLE_SSE=0 \
  -DENABLE_SSE2=0 \
@@ -207,7 +208,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%doc doc/license.txt
+%doc LICENSE
 %{_bindir}/opencv_*
 %{_libdir}/libopencv_calib3d.so.2.4*
 %{_libdir}/libopencv_contrib.so.2.4*
@@ -249,6 +250,9 @@ popd
 %{python2_sitearch}/cv2.so
 
 %changelog
+* Thu Jul 03 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.4.9-1
+- Update to 2.4.9
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 456cca3..8248a78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b540d75cdc7695098ab19fc7f56fd267  opencv-clean-2.4.7.tar.xz
+648e1de1869cb4d3d1e3316eca975005  opencv-clean-2.4.9.tar.xz