diff --git a/opencv-pkgcmake2.patch b/opencv-pkgcmake2.patch deleted file mode 100644 index 09d5e14..0000000 --- a/opencv-pkgcmake2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up OpenCV-2.4.2/cmake/templates/OpenCVConfig.cmake.in.pkgcmake2 OpenCV-2.4.2/cmake/templates/OpenCVConfig.cmake.in ---- OpenCV-2.4.2/cmake/templates/OpenCVConfig.cmake.in.pkgcmake2 2012-07-09 18:21:58.374388493 +0200 -+++ OpenCV-2.4.2/cmake/templates/OpenCVConfig.cmake.in 2012-07-09 18:22:32.465014020 +0200 -@@ -53,11 +53,7 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE - get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE) - - if(NOT WIN32 OR OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0) -- if(OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0) -- set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..") -- else() -- set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../..") -- endif() -+ set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..") - # Get the absolute path with no ../.. relative marks, to eliminate implicit linker warnings - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8) - get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_INSTALL_PATH}" ABSOLUTE) diff --git a/opencv.spec b/opencv.spec index b547a57..c673657 100644 --- a/opencv.spec +++ b/opencv.spec @@ -2,7 +2,7 @@ Name: opencv Version: 2.4.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries # This is normal three clause BSD. @@ -17,7 +17,6 @@ URL: http://opencv.org Source0: %{name}-clean-%{version}%{?indice}.tar.xz Source1: opencv-samples-Makefile Patch0: opencv-pkgcmake.patch -Patch1: opencv-pkgcmake2.patch #http://code.opencv.org/issues/2720 Patch2: OpenCV-2.4.4-pillow.patch Patch3: opencv-2.4.7-ts_static.patch @@ -117,7 +116,6 @@ This package contains Python bindings for the OpenCV library. %prep %setup -q %patch0 -p1 -b .pkgcmake -%patch1 -p1 -b .pkgcmake2 %patch2 -p1 -b .pillow %patch3 -p1 -b .ts_static %patch4 -p1 -b .cmake_paths @@ -251,6 +249,9 @@ popd %{python2_sitearch}/cv2.so %changelog +* Sat Apr 26 2014 Rex Dieter 2.4.7-6 +- revert pkgcmake2 patch (#1070428) + * Fri Jan 17 2014 Nicolas Chauvet - 2.4.7-5 - Fix opencv_ocl isn't part of -core