Accepting request 43249 from KDE:Distro:Factory

Copy from KDE:Distro:Factory/digikam based on submit request 43249 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/43249
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=49

digikam-1.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
-size 13970098

digikam-1.3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
+size 14990462

digikam.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun  8 09:45:18 UTC 2010 - adrian@suse.de
+
+- update to version 1.3.0
+   * New Database interface to support different database backend.
+     MySql and SQlite are supported. Internal and Remote MySql server are supported. 
+   * Bugfixes and smaller features
+- use source service to download tar ball
+
 -------------------------------------------------------------------
 Mon Jun  7 23:29:28 UTC 2010 - cornelis@solcon.nl
 

digikam.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package digikam (Version 1.2.0)
+# spec file for package digikam (Version 1.3.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -26,14 +26,12 @@ Url:            http://www.digikam.org/
 License:        GPLv2+
 Group:          Productivity/Graphics/Viewers
 Summary:        A KDE Photo Manager
-Version:        1.2.0
+Version:        1.3.0
-Release:        3
+Release:        1
-%define tar_version 1.2.0
+%define tar_version 1.3.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
@@ -101,9 +99,7 @@ Authors:
 %lang_package
 %prep
 %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
@@ -173,11 +169,7 @@ rm -rf filelists
 /usr/bin/showfoto
 /usr/bin/cleanup_digikamdb
 # new
-%_kde4_modules/digikamimageplugin_color.so
+%_kde4_modules/digikam*.so
-%_kde4_modules/digikamimageplugin_decorate.so
-%_kde4_modules/digikamimageplugin_enhance.so
-%_kde4_modules/digikamimageplugin_fxfilters.so
-%_kde4_modules/digikamimageplugin_transform.so
 # old
 %_kde4_modules/kio_digikamalbums.so
 %_kde4_modules/kio_digikamdates.so
@@ -194,11 +186,7 @@ rm -rf filelists
 %_kde_share_dir/apps/showfoto
 %_kde_share_dir/services/digikamalbums.protocol
 %_kde_share_dir/services/digikamdates.protocol
-%_kde_share_dir/services/digikamimageplugin_color.desktop
+%_kde_share_dir/services/digikam*.desktop
-%_kde_share_dir/services/digikamimageplugin_decorate.desktop
-%_kde_share_dir/services/digikamimageplugin_enhance.desktop
-%_kde_share_dir/services/digikamimageplugin_fxfilters.desktop
-%_kde_share_dir/services/digikamimageplugin_transform.desktop
 %_kde_share_dir/services/digikamsearch.protocol
 %_kde_share_dir/services/digikamtags.protocol
 %_kde_share_dir/servicetypes/digikamimageplugin.desktop
@@ -214,7 +202,6 @@ rm -rf filelists
 %dir /usr/share/locale/hne
 %dir /usr/share/locale/hne/LC_MESSAGES
 %endif
-%_kde4_modules/digikamnepomukservice.so
+%_kde4_libexecdir/digikamdatabaseserver
-%_kde_share_dir/services/digikamnepomukservice.desktop
 
 %changelog

fix-redeyestool.diff

@@ -1,28 +0,0 @@
---- 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()));
- 

r1109177.diff

@@ -1,14 +0,0 @@
-Index: digikam/ratingwidget.cpp
-===================================================================
---- digikam/ratingwidget.cpp	(revision 1109176)
-+++ digikam/ratingwidget.cpp	(revision 1109177)
-@@ -165,7 +165,7 @@
- void RatingWidget::setFadingValue(int value)
- {
-     d->fadingValue = value;
--    if (d->fadingValue >= 255)
-+    if (d->fadingValue >= 255 && d->fadingTimeLine)
-     {
-         d->fadingTimeLine->stop();
-     }
-