[gnome-panel/f18] Fix for gnome-menus path change

[Daniel Drake]

commit a5a87a7c5a24b6e5967b7a3fa66cefce320ddca2
Author: Daniel Drake <dsd at laptop.org>
Date:   Thu Nov 1 11:16:46 2012 -0600

    Fix for gnome-menus path change

 gnome-panel-use-gnome-menus.patch |   10 +++++-----
 gnome-panel.spec                  |    5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
index 320e7d1..87495cc 100644
--- a/gnome-panel-use-gnome-menus.patch
+++ b/gnome-panel-use-gnome-menus.patch
@@ -6,7 +6,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-pane
  	GtkWidget *main_menu;
  
 -	main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
-+	main_menu = create_applications_menu ("applications-gnome.menu", NULL, TRUE);
++	main_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
  
  	g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
  	/* FIXME need to update the panel on parent_set */
@@ -27,7 +27,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus gnome-panel-3.1.5/gno
  	if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
  		panel_addto_make_application_list (&dialog->application_list,
 -						   root, "applications.menu",
-+						   root, "applications-gnome.menu",
++						   root, "gnome-applications.menu",
  						   PANEL_ADDTO_MENU_SHOW_ALL);
  		panel_addto_populate_application_model (store, NULL, dialog->application_list);
  
@@ -39,7 +39,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus gnome-panel-3.1.5/
  	menubar->priv->info = NULL;
  
 -	menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
-+	menubar->priv->applications_menu = create_applications_menu ("applications-gnome.menu", NULL, TRUE);
++	menubar->priv->applications_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
  
  	menubar->priv->applications_item = panel_image_menu_item_new ();
  	gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
@@ -51,7 +51,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus gnome-panel-3.1
  
  static MenuPathRootItem root_items [] = {
 -	{ APPLICATIONS_MENU, "applications", "applications.menu" },
-+	{ APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
++	{ APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
  	{ GNOMECC_MENU,      "gnomecc",      "gnomecc.menu"      }
  };
  
@@ -63,7 +63,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus gnome-panel-3.1.
  	GSList             *retval;
  
 -	tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+	tree = gmenu_tree_new ("applications-gnome.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++	tree = gmenu_tree_new ("gnome-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
  
  	if (!gmenu_tree_load_sync (tree, NULL))
  		return NULL;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 66b988f..db6f39f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 3.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -256,6 +256,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-4.0.gir
 
 %changelog
+* Thu Nov  1 2012 Daniel Drake <dsd at laptop.org> - 3.6.0-2
+- Update for new gnome-menus gnome-applications filename (#868614)
+
 * Tue Sep 25 2012 Matthias Clasen <mclasen at redhat.com> - 3.6.0-1
 - Update to 3.6.0