[xsane] tidy up desktop file

[Nils Philippsen]

commit 74f55f415d0350c82d21805b72d253ee07dac1d0
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Jan 30 16:04:07 2013 +0100

    tidy up desktop file

 xsane-0.998-desktop-file.patch |   33 +++++++++++++++++++++++----------
 xsane.spec                     |   31 ++++++++++++++++---------------
 2 files changed, 39 insertions(+), 25 deletions(-)
---
diff --git a/xsane-0.998-desktop-file.patch b/xsane-0.998-desktop-file.patch
index 0aea5f4..396be67 100644
--- a/xsane-0.998-desktop-file.patch
+++ b/xsane-0.998-desktop-file.patch
@@ -1,31 +1,44 @@
-From f1b8fba60a7b02c17a3cc0a0f773fd11a4de4e93 Mon Sep 17 00:00:00 2001
+From e3f3e266249f77ff655299daeab3128347d6cb17 Mon Sep 17 00:00:00 2001
 From: Nils Philippsen <nils at redhat.com>
-Date: Fri, 2 Sep 2011 11:54:03 +0200
+Date: Wed, 30 Jan 2013 15:59:40 +0100
 Subject: [PATCH] patch: desktop-file
 
 Squashed commit of the following:
 
-commit 4a7ec671855e739649a06dc5c0a050bb6fd651ce
+commit e472b870c4490f41b9257c835d4c8c72a575e9e9
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Wed Jan 30 15:57:57 2013 +0100
+
+    desktop file: use Name, GenericName, X-GNOME-FullName
+
+commit 9f7f6a039193f91473ded79780bd72e29d7b94fb
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Wed Jan 30 15:57:14 2013 +0100
+
+    desktop file: remove obsolete encoding key
+
+commit 79a444793a60bd729c72283ad1920f0ce9c65dc2
 Author: Nils Philippsen <nils at redhat.com>
 Date:   Fri Nov 19 12:41:23 2010 +0100
 
     customize desktop file
 ---
- src/xsane.desktop | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ src/xsane.desktop | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/src/xsane.desktop b/src/xsane.desktop
-index d5161e5..efb2011 100644
+index d5161e5..a2a4a61 100644
 --- a/src/xsane.desktop
 +++ b/src/xsane.desktop
 @@ -1,9 +1,14 @@
  [Desktop Entry]
-+Version=1.0
- Encoding=UTF-8
+-Encoding=UTF-8
 -Name=XSane - Scanning
++Version=1.0
 +#Name=XSane - Scanning
-+Name=Scanner Tool
++Name=XSane
 +GenericName=Scanner Tool
++X-GNOME-FullName=XSane (Scanner Tool)
  Comment=Acquire images from a scanner
  Exec=xsane
 +TryExec=xsane
@@ -36,5 +49,5 @@ index d5161e5..efb2011 100644
 +Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 +StartupNotify=true
 -- 
-1.7.11.4
+1.8.1
 
diff --git a/xsane.spec b/xsane.spec
index 7322a9b..d00868b 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -34,28 +34,28 @@ Patch4: xsane-0.997-no-file-selected.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=198422
 # submitted to upstream (Oliver Rauch) via email, 2010-06-29
 Patch5: xsane-0.997-ipv6.patch
-# distro-specific: customize desktop file
-Patch6: xsane-0.998-desktop-file.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=693224
 # submitted to upstream (Oliver Rauch) via email, 2011-04-04
-Patch7: xsane-0.998-xsane_update_param-crash.patch
+Patch6: xsane-0.998-xsane_update_param-crash.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=624190
 # fix from: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/370818
 # submitted to upstream (Oliver Rauch) via email, 2011-06-01
-Patch8: xsane-0.998-preview-selection.patch
+Patch7: xsane-0.998-preview-selection.patch
 # build with libpng-1.5
 # submitted to upstream (Oliver Rauch) via email, 2011-11-21
-Patch9: xsane-0.998-libpng.patch
+Patch8: xsane-0.998-libpng.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=795085
 # distro-specific: set program name/wmclass so GNOME shell picks appropriate
 # high resolution icon file
-Patch10: xsane-0.998-wmclass.patch
+Patch9: xsane-0.998-wmclass.patch
 # calculate minimum window size better for multi-head setups
 # submitted to upstream (Oliver Rauch) via email, 2012-09-03
-Patch11: xsane-0.998-preview-window-size.patch
+Patch10: xsane-0.998-preview-window-size.patch
 # correct some typos in the man page, original patch by John Bradshaw
 # submitted to upstream (Oliver Rauch) via email, 2012-09-03
-Patch12: xsane-0.998-man.patch
+Patch11: xsane-0.998-man.patch
+# distro-specific: customize desktop file
+Patch12: xsane-0.998-desktop-file.patch
 # autoconf-generated files
 Patch100: xsane-0.998-1-autoconf.patch.bz2
 License: GPLv2+
@@ -113,13 +113,13 @@ done
 %patch3 -p1 -b .off-root-build
 %patch4 -p1 -b .no-file-selected
 %patch5 -p1 -b .ipv6
-%patch6 -p1 -b .desktop-file
-%patch7 -p1 -b .xsane_update_param-crash
-%patch8 -p1 -b .preview-selection.patch
-%patch9 -p1 -b .libpng
-%patch10 -p1 -b .wmclass
-%patch11 -p1 -b .preview-window-size
-%patch12 -p1 -b .man
+%patch6 -p1 -b .xsane_update_param-crash
+%patch7 -p1 -b .preview-selection.patch
+%patch8 -p1 -b .libpng
+%patch9 -p1 -b .wmclass
+%patch10 -p1 -b .preview-window-size
+%patch11 -p1 -b .man
+%patch12 -p1 -b .desktop-file
 
 %patch100 -p1 -b .autoconf
 
@@ -219,6 +219,7 @@ fi
 %changelog
 * Wed Jan 30 2013 Nils Philippsen <nils at redhat.com>
 - build with -fno-strict-aliasing
+- tidy up desktop file
 
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 0.998-14
 - rebuild due to "jpeg8-ABI" feature drop