[digikam] minor tweaks

[Rex Dieter]

commit 1e05c33ca8f8da2b5b7c32f23cba0ee5e6962994
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 13:31:35 2012 -0500

    minor tweaks
    
    - specify libk* BR versions
    - upstream patch for kipiplugins.desktop validation

 ..._re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff |   19 +++++++++++++++++++
 digikam.spec                                       |   15 ++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff b/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
new file mode 100644
index 0000000..de909fd
--- /dev/null
+++ b/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
@@ -0,0 +1,19 @@
+commit e6970f4f2fe48c9f38fb25ca252cc2799d6674d0
+Author: Gilles Caulier <caulier.gilles at gmail.com>
+Date:   Mon Sep 3 15:17:08 2012 +0200
+
+    use X- prefix with customized kipiplugins group of desktop file
+    BUGS: 306193
+    FIXED-IN: 3.0.0
+
+diff --git a/common/libkipiplugins/kipiplugins.desktop.cmake b/common/libkipiplugins/kipiplugins.desktop.cmake
+index 66c8a2e..c704b92 100644
+--- a/common/libkipiplugins/kipiplugins.desktop.cmake
++++ b/common/libkipiplugins/kipiplugins.desktop.cmake
+@@ -92,5 +92,5 @@ Type=Application
+ Exec=""
+ Icon=kipi-logo
+ 
+-[KipiPlugins Entry]
++[X-KipiPlugins Entry]
+ Version=${KIPIPLUGINS_VERSION_STRING}
diff --git a/digikam.spec b/digikam.spec
index ff41acb..df53fb1 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,8 +1,7 @@
-#define pre rc
 
 Name:	 digikam
 Version: 2.9.0
-Release: 1%{?pre}%{?dist}
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,6 +22,8 @@ Patch0: digikam-2.5.0-clapack-atlas.patch
 ## upstreamable patches
 
 ## upstream patches
+# https://projects.kde.org/projects/extragear/graphics/kipi-plugins/repository/revisions/e6970f4f2fe48c9f38fb25ca252cc2799d6674d0
+Patch100: changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
 
 # for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
@@ -43,9 +44,9 @@ BuildRequires: pkgconfig(libgphoto2_port)
 BuildRequires: pkgconfig(lqr-1)
 BuildRequires: pkgconfig(libpgf) >= 6.11.42
 BuildRequires: pkgconfig(libpng) >= 1.2.7
-BuildRequires: pkgconfig(libkdcraw)
-BuildRequires: pkgconfig(libkexiv2)
-BuildRequires: pkgconfig(libkipi)
+BuildRequires: pkgconfig(libkdcraw) >= 0.2.0
+BuildRequires: pkgconfig(libkexiv2) >= 1.0.0
+BuildRequires: pkgconfig(libkipi) >= 1.0.0
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: mysql-devel mysql-server
 BuildRequires: pkgconfig(exiv2)
@@ -218,6 +219,10 @@ BuildArch: noarch
 
 %patch0 -p1 -b .clapack-atlas
 
+pushd extra/kipi-plugins/
+%patch100 -p1 -b .kipiplugins_desktop
+popd
+
 
 %build