rdieter pushed to digikam (epel7). "backport linking fix"

[notifications at fedoraproject.org]

From 83618c01862b061f2149b58947961d8508c7addc Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Tue, 5 Aug 2014 18:17:31 +0300
Subject: backport linking fix


diff --git a/digikam-4.2.0-fix-linking.patch b/digikam-4.2.0-fix-linking.patch
new file mode 100644
index 0000000..143d3bc
--- /dev/null
+++ b/digikam-4.2.0-fix-linking.patch
@@ -0,0 +1,33 @@
+--- digikam-4.2.0/core/CMakeLists.txt	2014-08-04 02:25:59.000000000 +0300
++++ digikam-4.2.0/core/CMakeLists.txt	2014-08-05 18:12:32.189542242 +0300
+@@ -103,7 +103,7 @@
+ 
+ INCLUDE(MacroUtils)
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.6 core highgui imgproc)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ # check the libkdcraw version
+ 
+--- digikam-4.2.0/extra/kipi-plugins/CMakeLists.txt	2014-08-04 02:26:07.000000000 +0300
++++ digikam-4.2.0/extra/kipi-plugins/CMakeLists.txt	2014-08-05 18:09:46.758224538 +0300
+@@ -119,7 +119,7 @@
+ 
+ INCLUDE(MacroUtils)
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.6 core highgui objdetect contrib)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ # OpenMP detection requires CMake >= 2.6.3
+ 
+--- digikam-4.2.0/extra/libkface/CMakeLists.txt	2014-08-04 02:26:00.000000000 +0300
++++ digikam-4.2.0/extra/libkface/CMakeLists.txt	2014-08-05 18:10:22.216863850 +0300
+@@ -47,7 +47,7 @@
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.9 core highgui objdetect contrib)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
+ 
diff --git a/digikam.spec b/digikam.spec
index 98206bf..88a5578 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -24,6 +24,9 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 
 ## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=338037
+Patch100: digikam-4.2.0-fix-linking.patch
+
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -230,6 +233,8 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p1 -b .fix-linking
+
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/digikam.git/commit/?h=epel7&id=83618c01862b061f2149b58947961d8508c7addc