[gnome-session] Add patch to set XDG_MENU_PREFIX

[Florian Müllner]

commit b933ecfa52df910358af48116884d2d40a4bfcd9
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Thu Oct 18 17:02:01 2012 +0200

    Add patch to set XDG_MENU_PREFIX

 0001-main-Set-XDG_MENU_PREFIX.patch |   28 ++++++++++++++++++++++++++++
 gnome-session.spec                  |    8 +++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-main-Set-XDG_MENU_PREFIX.patch b/0001-main-Set-XDG_MENU_PREFIX.patch
new file mode 100644
index 0000000..3e74dcd
--- /dev/null
+++ b/0001-main-Set-XDG_MENU_PREFIX.patch
@@ -0,0 +1,28 @@
+From 6bda8ba424d2dbd2441d9a7e6553608dceaa8454 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Thu, 18 Oct 2012 16:53:12 +0200
+Subject: [PATCH] main: Set XDG_MENU_PREFIX
+
+---
+ gnome-session/main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 1903381..147daec 100644
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -347,6 +347,11 @@ main (int argc, char **argv)
+          */
+         gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
+ 
++        /* We want to use the GNOME menus which has the designed categories,
++         * not the legacy redhat-menus.
++         */
++        gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
++
+         client_store = gsm_store_new ();
+ 
+         xsmp_server = gsm_xsmp_server_new (client_store);
+-- 
+1.7.12.1
+
diff --git a/gnome-session.spec b/gnome-session.spec
index aed5c74..4b5c4d8 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,7 +3,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 3.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-session
 Source0: http://download.gnome.org/sources/gnome-session/3.6/%{name}-%{version}.tar.xz
@@ -13,6 +13,7 @@ Source2: gnome.desktop
 Patch0: gnome-session-3.3.1-llvmpipe.patch
 # Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202
 Patch1: gnome-session-3.3.92-nv30.patch
+Patch2: 0001-main-Set-XDG_MENU_PREFIX.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -82,6 +83,7 @@ Desktop file to add GNOME to display manager session menu.
 %setup -q
 %patch0 -p1 -b .llvmpipe
 %patch1 -p1 -b .nv30
+%patch2 -p1 -b .set-xdg-menu-prefix
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -156,6 +158,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Thu Oct 18 2012 Florian Müllner <fmuellner at redhat.com> - 3.6.1-2
+- Set XDG_MENU_PREFIX to pick the correct menu layout in
+  gnome-shell and alacarte
+
 * Tue Oct 16 2012 Kalev Lember <kalevlember at gmail.com> - 3.6.1-1
 - Update to 3.6.1