[gnome-panel] sync with f16
Matthias Clasen
mclasen at fedoraproject.org
Wed Aug 24 20:25:01 UTC 2011
commit 126c5e132fa90843b0813d3aca8ddb09902797ea
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Aug 24 16:24:15 2011 -0400
sync with f16
.gitignore | 1 +
gnome-panel-use-gnome-menus.patch | 84 ++++++++++++++++++++-----------------
gnome-panel.spec | 15 ++++---
sources | 2 +-
4 files changed, 56 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 217e5e6..126fd1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.0.0.tar.bz2
/gnome-panel-3.0.0.1.tar.bz2
/gnome-panel-3.0.2.tar.bz2
+/gnome-panel-3.1.5.tar.xz
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
index b2584d6..320e7d1 100644
--- a/gnome-panel-use-gnome-menus.patch
+++ b/gnome-panel-use-gnome-menus.patch
@@ -1,6 +1,7 @@
---- gnome-panel/menu.c~ 2011-03-29 10:20:47.000000000 -0400
-+++ gnome-panel/menu.c 2011-04-11 13:51:30.624874438 -0400
-@@ -1383,7 +1383,7 @@
+diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
+--- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
+@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
{
GtkWidget *main_menu;
@@ -9,31 +10,31 @@
g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
/* FIXME need to update the panel on parent_set */
---- gnome-panel/panel-menu-button.c~ 2011-04-04 12:09:04.000000000 -0400
-+++ gnome-panel/panel-menu-button.c 2011-04-11 13:51:45.021693156 -0400
-@@ -74,7 +74,7 @@
- } MenuPathRootItem;
+diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus gnome-panel-3.1.5/gnome-panel/panel-addto.c
+--- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
+@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
- static MenuPathRootItem root_items [] = {
-- { APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
- { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
- };
+- 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);
---- gnome-panel/panel-run-dialog.c~ 2011-03-28 17:08:42.000000000 -0400
-+++ gnome-panel/panel-run-dialog.c 2011-04-11 13:52:56.978793618 -0400
-@@ -867,7 +867,7 @@
- GMenuTreeDirectory *root;
- GSList *retval;
+ if (!gmenu_tree_load_sync (tree, NULL)) {
+ g_object_unref (tree);
+@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
-- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
-+ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
- gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+ 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",
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
- root = gmenu_tree_get_root_directory (tree);
---- gnome-panel/panel-menu-bar.c~ 2011-04-05 06:39:04.000000000 -0400
-+++ gnome-panel/panel-menu-bar.c 2011-04-11 13:51:57.430534186 -0400
-@@ -129,7 +129,7 @@
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
+@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
menubar->priv->info = NULL;
@@ -42,20 +43,27 @@
menubar->priv->applications_item = panel_image_menu_item_new ();
gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
---- gnome-panel/panel-addto.c~ 2011-04-01 06:39:58.000000000 -0400
-+++ gnome-panel/panel-addto.c 2011-04-11 13:52:08.655397696 -0400
-@@ -714,12 +714,12 @@
- G_TYPE_POINTER,
- G_TYPE_STRING);
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917 -0400
+@@ -74,7 +74,7 @@ typedef struct {
+ } MenuPathRootItem;
-- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
-+ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
- gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+ static MenuPathRootItem root_items [] = {
+- { APPLICATIONS_MENU, "applications", "applications.menu" },
++ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
+ };
- if ((root = gmenu_tree_get_root_directory (tree))) {
- panel_addto_make_application_list (&dialog->application_list,
-- root, "applications.menu",
-+ root, "applications-gnome.menu",
- PANEL_ADDTO_MENU_SHOW_ALL);
- panel_addto_populate_application_model (store, NULL, dialog->application_list);
+diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
+@@ -781,7 +781,7 @@ get_all_applications (void)
+ GMenuTreeDirectory *root;
+ 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);
+ if (!gmenu_tree_load_sync (tree, NULL))
+ return NULL;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ac592cf..ef456c5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.0.2
-Release: 4%{?dist}
+Version: 3.1.5
+Release: 3%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -42,7 +42,7 @@ Requires: gnome-menus >= %{gnome_menus_version}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
Requires: gnome-session-xsession
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# Band aid for "yum upgrade"
Requires: gnome-shell
@@ -157,7 +157,7 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
-%patch1 -p0
+%patch1 -p1 -b .menus
rm -f libtool
autoreconf -i -f
@@ -219,7 +219,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%files -f %{gettext_package}.lang
-%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/22x22/apps/*
@@ -257,7 +256,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files devel
-%defattr(-, root, root)
%{_bindir}/panel-test-applets
%{_includedir}/gnome-panel-4.0
%{_libdir}/pkgconfig/*
@@ -266,6 +264,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Aug 24 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.5-3
+- Sync with F16
+
* Tue Aug 16 2011 Milan Crha <mcrha at redhat.com> - 3.0.2-4
- Rebuild against newer evolution-data-server
diff --git a/sources b/sources
index 644e021..5657e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f2f644dc4081b72f6df7a65282af7c6 gnome-panel-3.0.2.tar.bz2
+36c8df6e3dd3041d3228b8354bb0dd29 gnome-panel-3.1.5.tar.xz
More information about the scm-commits
mailing list