From f1638db7ab71d806181e0561eac2216b8b3c34ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 26 Jun 2019 22:08:14 +0100 Subject: [PATCH] cmake: use relative PATH on OPENCV_CONFIG_INSTALL_PATH, fixes rhbz #1721876 cmake: don't set ENABLE_PKG_CONFIG --- opencv.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/opencv.spec b/opencv.spec index 35cbfa0..1ba2895 100644 --- a/opencv.spec +++ b/opencv.spec @@ -59,7 +59,7 @@ Name: opencv Version: 3.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -295,8 +295,7 @@ pushd build -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \ -DWITH_LIBV4L=ON \ -DWITH_OPENMP=ON \ - -DENABLE_PKG_CONFIG=OFF \ - -DOPENCV_CONFIG_INSTALL_PATH=%{_libdir}/cmake/OpenCV \ + -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \ %{?with_gdcm: -DWITH_GDCM=ON } \ %{?with_libmfx: -DWITH_MFX=ON } \ %{?with_clp: -DWITH_CLP=ON } \ @@ -430,6 +429,10 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Tue Jun 25 2019 Sérgio Basto - 3.4.6-4 +- cmake: use relative PATH on OPENCV_CONFIG_INSTALL_PATH, fixes rhbz #1721876 +- cmake: don't set ENABLE_PKG_CONFIG + * Wed Jun 12 2019 Sérgio Basto - 3.4.6-3 - Remove Obsoletes/Provides libopencv_java.so and use OPENCV_JAR_INSTALL_PATH