From 99b45e4e06dc35ebd5a1acc4ab339af61c299a72 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 11 Apr 2011 13:30:10 -0400 Subject: [PATCH] Use applications-gnome.menu --- gnome-shell-avoid-redhat-menus.patch | 12 ++++++++++++ gnome-shell.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnome-shell-avoid-redhat-menus.patch diff --git a/gnome-shell-avoid-redhat-menus.patch b/gnome-shell-avoid-redhat-menus.patch new file mode 100644 index 0000000..0e0b037 --- /dev/null +++ b/gnome-shell-avoid-redhat-menus.patch @@ -0,0 +1,12 @@ +--- gnome-shell-3.0.0.2/src/shell-app-system.c~ 2011-03-26 08:24:46.000000000 -0400 ++++ gnome-shell-3.0.0.2/src/shell-app-system.c 2011-04-11 12:56:52.665853268 -0400 +@@ -199,7 +199,8 @@ + * handle NODISPLAY semantics at a higher level or investigate them + * case by case. + */ +- priv->apps_tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); ++ /* FEDORA patch: use applications-gnome.menu */ ++ priv->apps_tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); + priv->settings_tree = gmenu_tree_lookup ("gnomecc.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); + + priv->app_change_timeout_id = 0; diff --git a/gnome-shell.spec b/gnome-shell.spec index 09faf25..0dd3bd1 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.0.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -9,6 +9,8 @@ URL: http://live.gnome.org/GnomeShell #VCS: git:git://git.gnome.org/gnome-shell Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.0/%{name}-%{version}.tar.bz2 +Patch0: gnome-shell-avoid-redhat-menus.patch + %define clutter_version 1.4.0 %define gobject_introspection_version 0.10.1 %define mutter_version 3.0.0 @@ -74,6 +76,7 @@ easy to use experience. %prep %setup -q +%patch0 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -133,6 +136,10 @@ gconftool-2 --makefile-install-rule \ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %changelog +* Mon Apr 11 2011 Colin Walters - 3.0.0.2-2 +- We want to use the GNOME menus which has the designed categories, + not the legacy redhat-menus. + * Fri Apr 08 2011 Nils Philippsen - 3.0.0.2-1 - Update to 3.0.0.2 (fixes missing import that was preventing extensions from loading.)