Accepting request 76972 from home:vuntz:branches:X11:common:Factory

Support Unity in .desktop files

OBS-URL: https://build.opensuse.org/request/show/76972
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=25

desktop-file-utils-unity.patch

@@ -0,0 +1,21 @@
+commit 47322e554cc5388a3e6325f36b7d07a13f124594
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Thu Mar 31 21:58:44 2011 +0530
+
+    Add Unity to list of registered environments
+    
+    See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
+
+diff --git a/src/validate.c b/src/validate.c
+index 04bc8d0..9c399a3 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -338,7 +338,7 @@ static struct {
+ };
+ 
+ static const char *show_in_registered[] = {
+-  "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
++  "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
+ };
+ 
+ static struct {

desktop-file-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 25 15:55:16 CEST 2011 - vuntz@opensuse.org
+
+- Add desktop-file-utils-unity.patch: add Unity to list of accepted
+  desktop environments; taken from git.
+
 -------------------------------------------------------------------
 Sat Feb 19 12:27:01 CET 2011 - vuntz@opensuse.org
 

desktop-file-utils.spec

@@ -28,6 +28,8 @@ Source0:        %{name}-%{version}.tar.bz2
 Source2:        macros.desktop-file-utils
 # PATCH-FEATURE-OPENSUSE desktop-file-utils-suse-keys.patch vuntz@opensuse.org -- Handle SUSE-specific keys in validator. This is not strictly necessary, since they are prefixed with X-, but we can verify that the value has the right type.
 Patch0:         desktop-file-utils-suse-keys.patch
+# PATCH-FIX-UPSTREAM deskopt-file-utils-unity.patch vuntz@opensuse.org -- Accept Unity as desktop environment, taken from git
+Patch1:         desktop-file-utils-unity.patch
 BuildRequires:  glib2-devel
 BuildRequires:  pkg-config
 PreReq:         /bin/rm
@@ -44,7 +46,8 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec
 
 %prep
 %setup -q
-%patch0
+%patch0 -p0
+%patch1 -p1
 
 %build
 %configure \