Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2015-08-05 19:12:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv-qt5.changes 2015-06-12 20:24:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2015-08-05 19:12:59.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 24 14:48:48 UTC 2015 - [email protected] + +- Update improve-sphinx-search.diff for new python-Sphinx(1.3.1) + * now that sphinx-build disallow executing without arguments and + give you "Insufficient arguments" error, use "sphinx-build -h" + instead + * the default usages output ie. sphinx-build(or --help) no longer + are standard error but standard output, drop OUTPUT_QUIET and + add OUTPUT_VARIABLE throws the output to SPHINX_OUTPUT as well + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2015-05-10 10:53:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2015-08-05 19:12:59.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 24 14:40:06 UTC 2015 - [email protected] + +- Update improve-sphinx-search.diff for new python-Sphinx(1.3.1) + * now that sphinx-build disallow executing without arguments and + give you "Insufficient arguments" error, use "sphinx-build -h" + instead + * the default usages output ie. sphinx-build(or --help) no longer + are standard error but standard output, drop OUTPUT_QUIET and + add OUTPUT_VARIABLE throws the output to SPHINX_OUTPUT as well + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ opencv.spec: same change ++++++ improve-sphinx-search.diff ++++++ --- /var/tmp/diff_new_pack.wn008A/_old 2015-08-05 19:13:03.000000000 +0200 +++ /var/tmp/diff_new_pack.wn008A/_new 2015-08-05 19:13:03.000000000 +0200 @@ -2,11 +2,19 @@ =================================================================== --- cmake/OpenCVDetectPython.cmake.orig +++ cmake/OpenCVDetectPython.cmake -@@ -126,7 +126,7 @@ if(PYTHON_EXECUTABLE) - OUTPUT_QUIET +@@ -122,11 +122,12 @@ if(PYTHON_EXECUTABLE) + if(BUILD_DOCS) + find_host_program(SPHINX_BUILD sphinx-build) + if(SPHINX_BUILD) +- execute_process(COMMAND "${SPHINX_BUILD}" +- OUTPUT_QUIET ++ execute_process(COMMAND "${SPHINX_BUILD}" -h ++ OUTPUT_VARIABLE SPHINX_OUTPUT ERROR_VARIABLE SPHINX_OUTPUT - OUTPUT_STRIP_TRAILING_WHITESPACE) +- OUTPUT_STRIP_TRAILING_WHITESPACE) - if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)") ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ERROR_STRIP_TRAILING_WHITESPACE) + if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9]*[^ \n]*)") set(SPHINX_VERSION "${CMAKE_MATCH_1}") set(HAVE_SPHINX 1)
