diff --git a/gnome-shell-avoid-redhat-menus.patch b/gnome-shell-avoid-redhat-menus.patch deleted file mode 100644 index febc6ce..0000000 --- a/gnome-shell-avoid-redhat-menus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-shell-3.5.3/src/shell-app-system.c.avoid-redhat-menus gnome-shell-3.5.3/src/shell-app-system.c ---- gnome-shell-3.5.3/src/shell-app-system.c.avoid-redhat-menus 2012-06-25 12:40:06.000000000 -0400 -+++ gnome-shell-3.5.3/src/shell-app-system.c 2012-06-26 00:45:55.824232085 -0400 -@@ -103,7 +103,7 @@ shell_app_system_init (ShellAppSystem *s - - /* We want to track NoDisplay apps, so we add INCLUDE_NODISPLAY. We'll - * filter NoDisplay apps out when showing them to the user. */ -- priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); -+ priv->apps_tree = gmenu_tree_new ("applications-gnome.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); - g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self); - - priv->settings_tree = gmenu_tree_new ("gnomecc.menu", 0); diff --git a/gnome-shell.spec b/gnome-shell.spec index 18a085e..a0b1ec4 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -9,7 +9,6 @@ URL: http://live.gnome.org/GnomeShell #VCS: git:git://git.gnome.org/gnome-shell Source0: http://download.gnome.org/sources/gnome-shell/3.5/%{name}-%{version}.tar.xz -Patch0: gnome-shell-avoid-redhat-menus.patch # Replace Epiphany with Firefox in the default favourite apps list Patch1: gnome-shell-favourite-apps-firefox.patch @@ -98,7 +97,6 @@ easy to use experience. %prep %setup -q -%patch0 -p1 -b .avoid-redhat-menus %patch1 -p1 -b .firefox %build @@ -164,6 +162,12 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %exclude %{_datadir}/gtk-doc %changelog +* Thu Oct 18 2012 Florian Müllner - 3.6.1-2 +- Remove avoid-redhat-menus patch + + The standard way of supporting a desktop-specific menu layout is + to set XDG_MENU_PREFIX (which we made gnome-session do now). + * Mon Oct 15 2012 Florian Müllner - 3.6.1-1 - Update to 3.6.1