[digikam] digikam-4.6.0

[nucleo]

commit aa61b15d5941da86ed279b68d4a428db9f4dbeb7
Author: nucleo <nucleo at fedoraproject.org>
Date:   Thu Dec 18 16:16:37 2014 +0200

    digikam-4.6.0

 .gitignore                      |    1 +
 digikam-4.5.0-enable-libs.patch |   38 --------------------------------------
 digikam.spec                    |   22 ++++++++++++----------
 sources                         |    2 +-
 4 files changed, 14 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a92682..227e499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /digikam-4.3.0.tar.bz2
 /digikam-4.4.0.tar.bz2
 /digikam-4.5.0.tar.bz2
+/digikam-4.6.0.tar.bz2
diff --git a/digikam.spec b/digikam.spec
index 7d56400..9a16dea 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name:    digikam
-Version: 4.5.0
-Release: 3%{?pre}%{?dist}
+Version: 4.6.0
+Release: 1%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -21,11 +21,6 @@ ExcludeArch: ppc64
 # TODO: upstream me
 Source1: digikam-import.desktop
 
-# build only libkface, libkgeomap, libmediawiki, libkvkontakte
-#-DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON enables also libkipi, libkexiv2, libkdcraw, libksane
-# https://bugs.kde.org/show_bug.cgi?id=340945
-Patch0: digikam-4.5.0-enable-libs.patch
-
 ## upstreamable patches
 
 ## upstream patches
@@ -240,8 +235,6 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch0 -p1 -b .enable-libs
-
 ## 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
@@ -257,7 +250,13 @@ mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DENABLE_LCMS2=ON -DENABLE_KDEPIMLIBSSUPPORT=ON ..
+%{cmake_kde4} -DENABLE_LCMS2=ON \
+              -DENABLE_KDEPIMLIBSSUPPORT=ON \
+              -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
+              -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \
+              -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \
+              -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
+              ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -565,6 +564,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Thu Dec 18 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.6.0-1
+- digikam-4.6.0
+
 * Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-3
 - rebuild (marble)
 - drop libjpeg-turbo workarounds (not needed anymore)
diff --git a/sources b/sources
index c374ddb..24c6cc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fb3ab7b7c765bc7a310ca87c8e37220  digikam-4.5.0.tar.bz2
+705e132f72eda603cb91ee6292f0b34b  digikam-4.6.0.tar.bz2