From d6fb410d6045c53cc44e3d58aa7a994b1d0d6b0b1e6550b52bd2614f49d2881d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 21 Jan 2015 21:13:12 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 133.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=5b2c4e4ad38d7905c7eff00107554e13 --- digikam.changes | 6 ++++++ digikam.spec | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/digikam.changes b/digikam.changes index 00a5985..8a21e7d 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 15 14:09:02 UTC 2015 - tittiatcoke@gmail.com + +- libkface is now a separate package. Do not use the bundled + version on opensUSE 13.2 and higher. + ------------------------------------------------------------------- Sat Jan 3 17:58:02 UTC 2015 - nico.kruber@gmail.com diff --git a/digikam.spec b/digikam.spec index 21659f8..90a4bf0 100644 --- a/digikam.spec +++ b/digikam.spec @@ -48,6 +48,9 @@ BuildRequires: libxslt-devel BuildRequires: baloo-devel %endif %if 0%{?suse_version} > 1310 +BuildRequires: libkface-devel +%endif +%if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-qt-devel %else BuildRequires: gstreamer-0_10-plugins-qt-devel @@ -188,6 +191,7 @@ Currently supported map engine are: - GoogleMap This library is used by kipi-plugins, digiKam and other kipi host programs. +%if 0%{?suse_version} < 1320 %package -n libkface-devel Summary: Development files for libkface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT @@ -207,6 +211,7 @@ Obsoletes: libkface2 %description -n libkface3 Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures. +%endif %package -n libmediawiki1 Summary: Interface for MediaWiki based web services @@ -259,11 +264,12 @@ popd %build %if 0%{?suse_version} < 1320 -EXTRA_FLAGS="-DENABLE_LCMS2=OFF" +EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE" %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS +%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS + # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 @@ -331,9 +337,11 @@ popd %postun -n libkgeomap2 -p /sbin/ldconfig +%if 0%{?suse_version} < 1320 %post -n libkface3 -p /sbin/ldconfig %postun -n libkface3 -p /sbin/ldconfig +%endif %post -n libmediawiki1 -p /sbin/ldconfig @@ -453,6 +461,7 @@ popd %{_kde4_appsdir}/libkgeomap/ %{_kde4_libdir}/libkgeomap.so.2* +%if 0%{?suse_version} < 1320 %files -n libkface3 %defattr(-,root,root,-) %{_kde4_appsdir}/libkface @@ -466,6 +475,7 @@ popd %{_kde4_libdir}/pkgconfig/libkface.pc %dir %{_kde4_libdir}/cmake/Kface-3.5.0/ %{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake +%endif %files -n libmediawiki1 %defattr(-,root,root,-)