From 319098a209ed38c6ee8cf9894cb9c0a8a4a82547 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 12 Sep 2019 07:42:01 +0900 Subject: [PATCH] F-32: remove vtk gcdm dependency for now because they have broken dependency (bug 1751406) --- opencv.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/opencv.spec b/opencv.spec index 54298e8..525581e 100644 --- a/opencv.spec +++ b/opencv.spec @@ -30,8 +30,14 @@ # check OpenCVFindLAPACK.cmake %bcond_with atlas %bcond_without openblas +# As of 2019-09-12 gdcm dependency is broken on Fedora 32 +%if 0%{?fedora} < 32 %bcond_without gdcm -%if 0%{?fedora} > 29 +%else +%bcond_with gdcm +%endif +# As of 2019-09-12 vtk dependency is broken on Fedora 32 +%if 0%{?fedora} > 29 && 0%{?fedora} < 32 %bcond_without vtk %else #VTK support disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.7.1.1 + Qt4 in <= F29 @@ -59,7 +65,7 @@ Name: opencv Version: 3.4.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of algorithms for computer vision # This is normal three clause BSD. License: BSD @@ -428,6 +434,10 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Wed Sep 11 2019 Mamoru TASAKA - 3.4.6-8 +- F-32: remove vtk gcdm dependency for now because they have broken dependency + (bug 1751406) + * Mon Aug 19 2019 Miro Hrončok - 3.4.6-7 - Rebuilt for Python 3.8