From b6f7a1d8be0d6ab31940fbc887f0fc8ff4b05607374c9cec66ca32736f11e35f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 21 Jun 2010 16:55:36 +0000
Subject: [PATCH] Accepting request 41783 from KDE:KDE4:Factory:Desktop

Copy from KDE:KDE4:Factory:Desktop/digikam based on submit request 41783 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/41783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=46
---
 digikam.changes      |  6 ++++++
 digikam.spec         |  4 +++-
 fix-redeyestool.diff | 28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 fix-redeyestool.diff

diff --git a/digikam.changes b/digikam.changes
index abff4b4..db316d3 100644
--- a/digikam.changes
+++ b/digikam.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  7 23:29:28 UTC 2010 - cornelis@solcon.nl
+
+- use right name for Red eyes tool action (fixes KDE bug 
+  234545: Red eye correction tool is missing from image editor)
+
 -------------------------------------------------------------------
 Mon May 10 17:54:14 UTC 2010 - cmorve69@yahoo.es
 
diff --git a/digikam.spec b/digikam.spec
index 84607ce..02fafb5 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -27,12 +27,13 @@ License:        GPLv2+
 Group:          Productivity/Graphics/Viewers
 Summary:        A KDE Photo Manager
 Version:        1.2.0
-Release:        2
+Release:        3
 %define tar_version 1.2.0
 Source0:        %name-%{tar_version}.tar.bz2
 Source1:        %{name}-docs.tar.bz2
 Patch0:         r1109177.diff
 Patch1:         %{name}-buildtime.patch
+Patch2:         fix-redeyestool.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 %kde4_pimlibs_requires
@@ -102,6 +103,7 @@ Authors:
 %setup -q -n %name-%{tar_version} -a 1
 %patch0
 %patch1
+%patch2
 FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake
 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
diff --git a/fix-redeyestool.diff b/fix-redeyestool.diff
new file mode 100644
index 0000000..0e631ad
--- /dev/null
+++ b/fix-redeyestool.diff
@@ -0,0 +1,28 @@
+--- imageplugins/enhance/digikamimageplugin_enhance_ui.rc	2010/04/25 04:51:21	1118551
++++ imageplugins/enhance/digikamimageplugin_enhance_ui.rc	2010/04/25 05:31:21	1118552
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<gui version="21" name="digikamimageplugin_enhance" >
++<gui version="22" name="digikamimageplugin_enhance" >
+ 
+  <MenuBar>
+ 
+@@ -39,6 +39,6 @@
+       <Action shortcut="" name="imageplugin_antivignetting" />
+       <Action shortcut="" name="imageplugin_lensdistortion" />
+       <Action shortcut="" name="imageplugin_hotpixels" />
+-</ActionProperties>
++ </ActionProperties>
+ 
+ </gui>
+--- imageplugins/enhance/imageplugin_enhance.cpp	2010/04/25 04:51:21	1118551
++++ imageplugins/enhance/imageplugin_enhance.cpp	2010/04/25 05:31:21	1118552
+@@ -89,7 +89,7 @@
+     m_redeyeAction = new KAction(KIcon("redeyes"), i18n("Red Eye..."), this);
+     m_redeyeAction->setWhatsThis(i18n("This filter can be used to correct red eyes in a photo. "
+                                       "Select a region including the eyes to use this option."));
+-    actionCollection()->addAction("implugcore_redeye", m_redeyeAction);
++    actionCollection()->addAction("imageplugin_redeye", m_redeyeAction);
+     connect(m_redeyeAction, SIGNAL(triggered(bool) ),
+             this, SLOT(slotRedEye()));
+ 
\ No newline at end of file