rdieter pushed to digikam (epel7). "revert install libkface devel files, fix libkface-devel files"

[notifications at fedoraproject.org]

From aa5e9eaa78fffe4ce5a56363c0c6ac4200f1c81a Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Thu, 18 Dec 2014 18:45:05 +0200
Subject: revert install libkface devel files, fix libkface-devel files


diff --git a/digikam-4.6.0-libkface-devel-files.patch b/digikam-4.6.0-libkface-devel-files.patch
deleted file mode 100644
index 156ff78..0000000
--- a/digikam-4.6.0-libkface-devel-files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt	2014-12-16 09:54:40.000000000 +0200
-+++ digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt	2014-12-18 18:10:16.881222835 +0200
-@@ -64,7 +64,7 @@
-         DESTINATION ${DATA_INSTALL_DIR}/libkface/database )
- 
- # Check if compilation is done through digiKam SC or not. If yes, do not install header files.
--if(NOT DIGIKAMSC_COMPILE_LIBKFACE)
-+if(DIGIKAMSC_COMPILE_LIBKFACE)
- 
-     install(FILES facedetector.h
-                   recognitiondatabase.h
diff --git a/digikam.spec b/digikam.spec
index 7344821..38fcf4b 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -21,10 +21,6 @@ ExcludeArch: ppc64
 # TODO: upstream me
 Source1: digikam-import.desktop
 
-# https://bugs.kde.org/show_bug.cgi?id=342004
-# install libkface devel files
-Patch0: digikam-4.6.0-libkface-devel-files.patch
-
 ## upstreamable patches
 
 ## upstream patches
@@ -239,8 +235,6 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch0 -p1 -b .libkface-devel-files.patch
-
 ## HACK to allow building with older opencv (for now), see
 # https://bugzilla.redhat.com/show_bug.cgi?id=1119036
 sed -i.opencv_247 -e 's|^DETECT_OPENCV(2.4.9 |DETECT_OPENCV(2.4.7 |' extra/libkface/CMakeLists.txt
@@ -411,10 +405,8 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/libkface.so.3*
 
 %files -n libkface-devel
-%{_kde4_includedir}/libkface/
 %{_kde4_libdir}/libkface.so
 %{_kde4_libdir}/cmake/Kface-3.5.0/
-%{_libdir}/pkgconfig/libkface.pc
 
 %post -n libkgeomap -p /sbin/ldconfig
 %postun -n libkgeomap -p /sbin/ldconfig
-- 
cgit v0.10.2


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