From d6b2548b1181b76ce2ed9d50856722cc873934fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 13 Oct 2019 23:57:58 +0100 Subject: [PATCH] Update to 4.1.2 --- opencv-clean.sh | 2 +- opencv.spec | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/opencv-clean.sh b/opencv-clean.sh index 9016048..8014a3e 100755 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,4 +1,4 @@ -export VERSION=4.1.1 +export VERSION=4.1.2 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz tar xf opencv-${VERSION}.tar.gz diff --git a/opencv.spec b/opencv.spec index 94271ff..f333c6e 100644 --- a/opencv.spec +++ b/opencv.spec @@ -50,7 +50,7 @@ %global srcname opencv %global abiver 4.1 -%global javaver 411 +%global javaver 412 # Required because opencv-core has lot of spurious dependencies # (despite supposed to be "-core") @@ -59,7 +59,7 @@ %global optflags %(echo %{optflags} -Wl,--as-needed ) Name: opencv -Version: 4.1.1 +Version: 4.1.2 Release: 1%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. @@ -298,6 +298,7 @@ popd -DINSTALL_PYTHON_EXAMPLES=ON \ -DPYTHON2_EXECUTABLE=false \ -DPYTHON3_EXECUTABLE=%{__python3} \ + -DPYTHON3_PACKAGES_PATH=%{python3_sitearch} \ -DENABLE_PYLINT=ON \ -DBUILD_PROTOBUF=OFF \ -DPROTOBUF_UPDATE_FILES=ON \ @@ -415,9 +416,10 @@ popd %{_libdir}/libopencv_calib3d.so.%{abiver}* %{_libdir}/libopencv_ccalib.so.%{abiver}* #Module opencv_datasets disabled because opencv_text dependency can't be resolved! -%{_libdir}/libopencv_datasets.so.%%{abiver}* -%{_libdir}/libopencv_dnn.so.%%{abiver}* -%{_libdir}/libopencv_dnn_objdetect.so.%%{abiver}* +%{_libdir}/libopencv_datasets.so.%{abiver}* +%{_libdir}/libopencv_dnn.so.%{abiver}* +%{_libdir}/libopencv_dnn_objdetect.so.%{abiver}* +%{_libdir}/libopencv_dnn_superres.so.%{abiver}* %{_libdir}/libopencv_dpm.so.%{abiver}* %{_libdir}/libopencv_face.so.%{abiver}* %{_libdir}/libopencv_freetype.so.%{abiver}* @@ -435,13 +437,16 @@ popd %{_libdir}/libopencv_stereo.so.%{abiver}* %{_libdir}/libopencv_structured_light.so.%{abiver}* %{_libdir}/libopencv_surface_matching.so.%{abiver}* -%{_libdir}/libopencv_text.so.%%{abiver}* +%{_libdir}/libopencv_text.so.%{abiver}* %{_libdir}/libopencv_tracking.so.%{abiver}* %{_libdir}/libopencv_ximgproc.so.%{abiver}* %{_libdir}/libopencv_xobjdetect.so.%{abiver}* %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Sat Oct 12 2019 Nicolas Chauvet - 4.1.2-1 +- Update to 4.1.2 + * Fri Sep 13 2019 Nicolas Chauvet - 4.1.1-1 - Update to 4.1.1