From c35fe4bbbba14a2c388c62ee1a20abecad9ddeec01e15bafb163accd6298d2ad Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 19 Feb 2010 12:03:00 +0000
Subject: [PATCH] Accepting request 32916 from
 home:vuntz:branches:X11:common:Factory

Copy from home:vuntz:branches:X11:common:Factory/desktop-file-utils via accept of submit request 32916 revision 4.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/32916
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=8
---
 desktop-file-utils-LXDE-key.patch | 12 ++++++++++++
 desktop-file-utils.changes        | 12 ++++++++++++
 desktop-file-utils.spec           | 14 ++++++++------
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 desktop-file-utils-LXDE-key.patch

diff --git a/desktop-file-utils-LXDE-key.patch b/desktop-file-utils-LXDE-key.patch
new file mode 100644
index 0000000..00b447c
--- /dev/null
+++ b/desktop-file-utils-LXDE-key.patch
@@ -0,0 +1,12 @@
+diff -uNr old-desktop-file-utils-0.15//src/validate.c desktop-file-utils-0.15/src/validate.c
+--- old-desktop-file-utils-0.15//src/validate.c	2008-02-05 13:06:11.000000000 +0100
++++ desktop-file-utils-0.15/src/validate.c	2009-12-13 18:00:29.480228379 +0100
+@@ -324,7 +324,7 @@
+ };
+ 
+ static const char *show_in_registered[] = {
+-  "KDE", "GNOME", "ROX", "XFCE", "Old"
++  "KDE", "GNOME", "LXDE", "ROX", "XFCE", "Old"
+ };
+ 
+ static const char *main_categories_registered[] = {
diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes
index 847addc..6484192 100644
--- a/desktop-file-utils.changes
+++ b/desktop-file-utils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Feb 19 13:01:54 CET 2010 - vuntz@opensuse.org
+
+- Make Requires on aaa_base unversioned: there was no reason to
+  version it, or at least not anymore; and this is needed for the
+  Moblin merge.
+
+-------------------------------------------------------------------
+Sun Dec 13 17:01:01 UTC 2009 - andrea@opensuse.org
+
+- added LXDE patch, since this is now a valide DE 
+
 -------------------------------------------------------------------
 Thu Aug 20 10:52:02 CEST 2009 - beineri@opensuse.org
 
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index d79c1e0..625abbb 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -20,15 +20,16 @@
 
 Name:           desktop-file-utils
 BuildRequires:  glib2-devel pkg-config
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Development/Tools/Other
 Version:        0.15
-Release:        84
-Source:         %{name}-%{version}.tar.bz2
+Release:        85
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        SuSEconfig.desktop-file-utils
-Patch:          desktop-file-utils-suse-keys.patch
+Patch0:         desktop-file-utils-suse-keys.patch
+Patch1:         desktop-file-utils-LXDE-key.patch
 PreReq:         /bin/rm /bin/rmdir
-Requires:       aaa_base >= 10.1
+Requires:       aaa_base
 Url:            http://www.freedesktop.org/wiki/Software/desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Utilities for Manipulating Desktop Files
@@ -42,7 +43,8 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec
 
 %prep
 %setup
-%patch
+%patch0
+%patch1 -p1
 
 %build
 %configure \