[kiten] upstream .desktop file validation fixes

[Rex Dieter]

commit 9be0b87fb38c6232c4e81c51b6c55be6e2599040
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jul 12 08:58:12 2012 -0500

    upstream .desktop file validation fixes

 0001-already-had-an-X-DocPath-entry.patch       |   25 +++++++++++++++++
 0002-.desktop-booleans-must-be-lower-case.patch |   34 +++++++++++++++++++++++
 kiten.spec                                      |   15 ++++++++--
 3 files changed, 71 insertions(+), 3 deletions(-)
---
diff --git a/0001-already-had-an-X-DocPath-entry.patch b/0001-already-had-an-X-DocPath-entry.patch
new file mode 100644
index 0000000..5ab6ad7
--- /dev/null
+++ b/0001-already-had-an-X-DocPath-entry.patch
@@ -0,0 +1,25 @@
+From e7ce2eef0a2611fd9247ddd985bbda5f92240869 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at fedoraproject.org>
+Date: Thu, 12 Jul 2012 08:44:38 -0500
+Subject: [PATCH 1/2] already had an X-DocPath entry
+
+duplicate keys fail .desktop validatation
+---
+ app/kiten.desktop |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/app/kiten.desktop b/app/kiten.desktop
+index ed40fa7..f73a8f7 100644
+--- a/app/kiten.desktop
++++ b/app/kiten.desktop
+@@ -189,7 +189,6 @@ Name[xh]=Kiten
+ Name[x-test]=xxKitenxx
+ Name[zh_CN]=Kiten
+ Name[zh_TW]=語言_Kiten
+-X-DocPath=kiten/index.html
+ Terminal=false
+ Type=Application
+ Icon=kiten
+-- 
+1.7.10.4
+
diff --git a/0002-.desktop-booleans-must-be-lower-case.patch b/0002-.desktop-booleans-must-be-lower-case.patch
new file mode 100644
index 0000000..a1976b3
--- /dev/null
+++ b/0002-.desktop-booleans-must-be-lower-case.patch
@@ -0,0 +1,34 @@
+From 44b9e42b327f3fb2e7cb601b92fc69ba656ef2e3 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at fedoraproject.org>
+Date: Thu, 12 Jul 2012 08:54:21 -0500
+Subject: [PATCH 2/2] .desktop booleans must be lower-case
+
+more desktop-file-validate fun
+---
+ kanjibrowser/kitenkanjibrowser.desktop |    2 +-
+ radselect/kitenradselect.desktop       |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kanjibrowser/kitenkanjibrowser.desktop b/kanjibrowser/kitenkanjibrowser.desktop
+index 7208c60..ec7ab67 100644
+--- a/kanjibrowser/kitenkanjibrowser.desktop
++++ b/kanjibrowser/kitenkanjibrowser.desktop
+@@ -14,4 +14,4 @@ X-DocPath=kiten/index.html#kanji-list
+ Terminal=false
+ Type=Application
+ Icon=kiten
+-NoDisplay=True
++NoDisplay=true
+diff --git a/radselect/kitenradselect.desktop b/radselect/kitenradselect.desktop
+index edf2ba4..dea261d 100644
+--- a/radselect/kitenradselect.desktop
++++ b/radselect/kitenradselect.desktop
+@@ -14,4 +14,4 @@ X-DocPath=kiten/index.html#radical-search
+ Terminal=false
+ Type=Application
+ Icon=kiten
+-NoDisplay=True
++NoDisplay=true
+-- 
+1.7.10.4
+
diff --git a/kiten.spec b/kiten.spec
index 1dbc70e..272494a 100644
--- a/kiten.spec
+++ b/kiten.spec
@@ -14,11 +14,15 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+## upstream patches
+Patch100: 0001-already-had-an-X-DocPath-entry.patch
+Patch101: 0002-.desktop-booleans-must-be-lower-case.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 Requires: kanjistrokeorders-fonts
 
 %description
@@ -48,6 +52,9 @@ Requires: kdelibs4-devel
 %prep
 %setup -q
 
+%patch100 -p1 -b .dt_x_docpath
+%patch101 -p1 -b .dt_hidden_boolean
+
 
 %build
 mkdir -p %{_target_platform}
@@ -68,7 +75,9 @@ rm -fv %{buildroot}%{_datadir}/fonts/kanjistrokeorders/KanjiStrokeOrders.ttf
 
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/kiten*.desktop ; do
+desktop-file-validate $f
+done
 
 
 %post
@@ -93,7 +102,7 @@ fi
 %{_kde4_appsdir}/kiten/
 %{_kde4_appsdir}/kitenkanjibrowser/
 %{_kde4_appsdir}/kitenradselect/
-%{_kde4_datadir}/applications/kde4/kiten.desktop
+%{_kde4_datadir}/applications/kde4/kiten*.desktop
 %{_kde4_datadir}/config.kcfg/kiten.kcfg
 %{_kde4_iconsdir}/hicolor/*/*/kiten.*