Accepting request 355402 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/355402
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=60

opencv-build-compare.patch

@@ -0,0 +1,46 @@
+---
+ CMakeLists.txt          |    4 ++--
+ cmake/OpenCVUtils.cmake |    3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+Index: opencv-2.4.11/CMakeLists.txt
+===================================================================
+--- opencv-2.4.11.orig/CMakeLists.txt
++++ opencv-2.4.11/CMakeLists.txt
+@@ -675,11 +675,11 @@ endif()
+ # ========================== build platform ==========================
+ status("")
+ status("  Platform:")
+-status("    Host:"             ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
++status("    Host:"             "Linux")
+ if(CMAKE_CROSSCOMPILING)
+   status("    Target:"         ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR})
+ endif()
+-status("    CMake:"            ${CMAKE_VERSION})
++status("    CMake:"            "YES")
+ status("    CMake generator:"  ${CMAKE_GENERATOR})
+ status("    CMake build tool:" ${CMAKE_BUILD_TOOL})
+ if(MSVC)
+Index: opencv-2.4.11/cmake/OpenCVUtils.cmake
+===================================================================
+--- opencv-2.4.11.orig/cmake/OpenCVUtils.cmake
++++ opencv-2.4.11/cmake/OpenCVUtils.cmake
+@@ -319,15 +319,18 @@ function(status text)
+       if(${status_cond})
+         string(REPLACE ";" " " status_then "${status_then}")
+         string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
++        string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_then "${status_then}")
+         ocv_output_status("${status_text} ${status_then}")
+       else()
+         string(REPLACE ";" " " status_else "${status_else}")
+         string(REGEX REPLACE "^[ \t]+" "" status_else "${status_else}")
++        string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_else "${status_else}")
+         ocv_output_status("${status_text} ${status_else}")
+       endif()
+     else()
+       string(REPLACE ";" " " status_cond "${status_cond}")
+       string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}")
++      string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_cond "${status_cond}")
+       ocv_output_status("${status_text} ${status_cond}")
+     endif()
+   else()

opencv-qt5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
+
+- Reduce build-compare noise
+  opencv-build-compare.patch
+
 -------------------------------------------------------------------
 Wed Dec 23 16:51:20 UTC 2015 - alarrosa@suse.com
 

opencv-qt5.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package opencv-qt5
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,6 +44,8 @@ Patch5:         opencv-altivec-vector.patch
 Patch6:         opencv-gcc5.patch
 # PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
 Patch7:         opencv-gles.patch
+# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
+Patch8:         opencv-build-compare.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 %if 0%{?suse_version} > 1310
@@ -157,6 +159,7 @@ This package contains the documentation and examples for the OpenCV library.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # Remove Windows specific files
 rm -f doc/packaging.txt

opencv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 22 09:47:00 UTC 2016 - olaf@aepfle.de
+
+- Reduce build-compare noise
+  opencv-build-compare.patch
+
 -------------------------------------------------------------------
 Wed Dec 23 16:51:20 UTC 2015 - alarrosa@suse.com
 

opencv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package opencv
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,8 @@ Patch4:         opencv-pkgconfig.patch
 Patch5:         opencv-altivec-vector.patch
 # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
 Patch6:         opencv-gcc5.patch
+# PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes
+Patch8:         opencv-build-compare.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 %if 0%{?suse_version} > 1310
@@ -143,6 +145,7 @@ This package contains the documentation and examples for the OpenCV library.
 #%patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch8 -p1
 
 # Remove Windows specific files
 rm -f doc/packaging.txt