Accepting request 90540 from KDE:Distro:Factory

- Workaround kde#286034 

- update to version 2.3.0
  * Bugfix release, please see included NEWS file for fixed bugs.

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

add_mimetype_bnc629393.diff

@@ -1,7 +0,0 @@
---- core/digikam/main/digikam.desktop.orig	2011-07-28 02:28:24.000000000 +0300
-+++ core/digikam/main/digikam.desktop	2011-08-08 21:01:49.542000054 +0300
-@@ -148,3 +148,4 @@
- Comment[zh_CN]=专业照片管理 彰显开源力量
- Comment[zh_TW]=運用開放原始碼的力量像專業人士般管理您的照片
- Terminal=false
-+MimeType=x-content/image-dcf;x-content/image-picturecd;

digikam-2.2.0.tar.bz2

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

digikam-2.3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
+size 54522109

digikam-external-libs.patch

@@ -1,14 +1,16 @@
---- CMakeLists.txt.orig	2011-09-07 14:10:20.000000000 +0200
-+++ CMakeLists.txt	2011-09-09 15:30:52.649954215 +0200
-@@ -79,12 +79,7 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -74,12 +74,6 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
      SET(KSANE_LOCAL_DIR extra/libksane)
  ENDIF()
  
 -SET(KFACE_LOCAL_DIR extra/libkface)
 -SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
 -SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
--SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
-
+-SET(KVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
+-
 -ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(core)
  ADD_SUBDIRECTORY(doc)

digikam.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov  8 11:03:03 UTC 2011 - idonmez@suse.com
+
+- Workaround kde#286034 
+
+-------------------------------------------------------------------
+Mon Nov  7 10:46:01 UTC 2011 - adrian@suse.de
+
+- update to version 2.3.0
+  * Bugfix release, please see included NEWS file for fixed bugs.
+
 -------------------------------------------------------------------
 Fri Oct 14 12:30:54 UTC 2011 - toddrme2178@gmail.com
 

digikam.spec

@@ -15,8 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           digikam
-Version:        2.2.0
+Version:        2.3.0
 Release:        1
 License:        GPL-2.0+
 Summary:        A KDE Photo Manager
@@ -25,10 +27,8 @@ Group:          Productivity/Graphics/Viewers
 Source0:        http://sourceforge.net/projects/digikam/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work
 Patch0:         digikam-buildtime.patch
-# PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctrippe@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME
-Patch1:         add_mimetype_bnc629393.diff
 # PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs
-Patch2:         digikam-external-libs.patch
+Patch1:         digikam-external-libs.patch
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -79,7 +79,6 @@ This package contains the documentation for digikam
 rm po/*/kipi*
 %patch0
 %patch1
-%patch2
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -100,6 +99,9 @@ rm -rf %{buildroot}%{_kde4_htmldir}/en/kipi-plugins
 rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so
 rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
 
+# Workaround kde#286034
+mv %{buildroot}/usr/share/icons/oxygen %{buildroot}/usr/share/icons/hicolor
+
 %if 0%{?suse_version}
 %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography
 %suse_update_desktop_file -G "Photo Editor" -r showfoto Qt KDE Graphics Photography
@@ -110,6 +112,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
 %kde_post_install
 
 %post   -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %files