From 15a0c61cfbd26f3cb0e900a46e74305b2475d760 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Aug 05 2008 04:15:10 +0000 Subject: 2.23.6 --- diff --git a/.cvsignore b/.cvsignore index deb1d98..01a0e49 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-menus-2.23.5.tar.bz2 +gnome-menus-2.23.6.tar.bz2 diff --git a/gnome-menus-2.13.5-break-loop.patch b/gnome-menus-2.13.5-break-loop.patch deleted file mode 100644 index cad81b7..0000000 --- a/gnome-menus-2.13.5-break-loop.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gnome-menus-2.13.5/libmenu/gmenu-tree.c.break-loop 2006-02-06 12:16:09.000000000 -0500 -+++ gnome-menus-2.13.5/libmenu/gmenu-tree.c 2006-02-06 12:16:25.000000000 -0500 -@@ -764,8 +764,7 @@ - path = NULL; - } - -- tmp = directory->contents; -- while (tmp != NULL) -+ for (tmp = directory->contents; tmp != NULL; tmp = tmp->next) - { - GMenuTreeItem *item = tmp->data; - -@@ -781,8 +780,6 @@ - else - return GMENU_TREE_DIRECTORY (item); - } -- -- tmp = tmp->next; - } - - g_free (freeme); diff --git a/gnome-menus-2.17.91-show-preferences.patch b/gnome-menus-2.17.91-show-preferences.patch deleted file mode 100644 index ec45ce5..0000000 --- a/gnome-menus-2.17.91-show-preferences.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- gnome-menus-2.17.91/desktop-directories/Preferences.directory.in.show-preferences 2007-02-15 19:06:24.000000000 -0500 -+++ gnome-menus-2.17.91/desktop-directories/Preferences.directory.in 2007-02-15 19:06:30.000000000 -0500 -@@ -4,4 +4,3 @@ - Icon=gnome-settings - Type=Directory - Encoding=UTF-8 --NoDisplay=true diff --git a/gnome-menus-2.21.3-gio-monitor-api.patch b/gnome-menus-2.21.3-gio-monitor-api.patch deleted file mode 100644 index 23cfcb5..0000000 --- a/gnome-menus-2.21.3-gio-monitor-api.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- trunk/libmenu/menu-monitor-gio.c 2007/12/14 14:53:01 810 -+++ trunk/libmenu/menu-monitor-gio.c 2008/01/08 12:41:59 825 -@@ -68,8 +68,8 @@ - void - menu_monitor_backend_register_monitor (MenuMonitor *monitor) - { -- GObject *backend = NULL; - GFile *file; -+ GFileMonitor *file_monitor; - - file = g_file_new_for_path (menu_monitor_get_path (monitor)); - -@@ -82,47 +82,33 @@ - } - - if (menu_monitor_get_is_directory (monitor)) -- { -- GDirectoryMonitor *dmonitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL); -- -- if (dmonitor) -- backend = G_OBJECT (dmonitor); -- } -+ file_monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL); - else -- { -- GFileMonitor *fmonitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL); -- -- if (fmonitor) -- backend = G_OBJECT (fmonitor); -- } -+ file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL); - - g_object_unref (G_OBJECT (file)); - -- if (backend == NULL) -+ if (file_monitor == NULL) - { - menu_verbose ("Not adding %s monitor on '%s', failed to create monitor\n", - menu_monitor_get_is_directory (monitor) ? "directory" : "file", - menu_monitor_get_path (monitor)); - return; - } -- -- g_signal_connect (backend, "changed", G_CALLBACK (monitor_callback), monitor); - -- menu_monitor_set_backend_data (monitor, backend); -+ g_signal_connect (file_monitor, "changed", G_CALLBACK (monitor_callback), monitor); -+ -+ menu_monitor_set_backend_data (monitor, file_monitor); - } - - void - menu_monitor_backend_unregister_monitor (MenuMonitor *monitor) - { -- GObject *backend; -+ GFileMonitor *file_monitor; - -- if ((backend = G_OBJECT (menu_monitor_get_backend_data (monitor))) != NULL) -+ if ((file_monitor = menu_monitor_get_backend_data (monitor)) != NULL) - { -- if (G_IS_FILE_MONITOR (backend)) -- g_file_monitor_cancel (G_FILE_MONITOR (backend)); -- else -- g_directory_monitor_cancel (G_DIRECTORY_MONITOR (backend)); -- -- g_object_unref (backend); -+ g_file_monitor_cancel (file_monitor); -+ g_object_unref (file_monitor); - } - } diff --git a/gnome-menus.spec b/gnome-menus.spec index 331965f..9b4d4e3 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -5,8 +5,8 @@ Summary: A menu system for the GNOME project Name: gnome-menus -Version: 2.23.5 -Release: 2%{?dist} +Version: 2.23.6 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org/ @@ -22,9 +22,6 @@ BuildRequires: pkgconfig BuildRequires: python2-devel >= 2.3.0 BuildRequires: intltool -# http://bugzilla.gnome.org/show_bug.cgi?id=545862 -Patch0: icon-names.patch - %description gnome-menus is an implementation of the draft "Desktop Menu Specification" from freedesktop.org. This package @@ -47,7 +44,6 @@ writing applications that use the GNOME menu system. %prep %setup -q -%patch0 -p1 -b .icon-names %build %configure --with-monitor-backend=gio \ @@ -103,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gnome-menus %changelog +* Tue Aug 5 2008 Matthias Clasen - 2.23.6-1 +- Update to 2.23.6 + * Fri Aug 1 2008 Matthias Clasen - 2.23.5-2 - Use standard icon names diff --git a/icon-names.patch b/icon-names.patch deleted file mode 100644 index 4f74310..0000000 --- a/icon-names.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up gnome-menus-2.23.5/desktop-directories/Utility-Accessibility.directory.in.icon-names gnome-menus-2.23.5/desktop-directories/Utility-Accessibility.directory.in ---- gnome-menus-2.23.5/desktop-directories/Utility-Accessibility.directory.in.icon-names 2008-08-01 10:38:30.000000000 -0400 -+++ gnome-menus-2.23.5/desktop-directories/Utility-Accessibility.directory.in 2008-08-01 10:39:00.000000000 -0400 -@@ -2,4 +2,4 @@ - _Name=Universal Access - _Comment=Universal Access Settings - Type=Directory --Icon=accessibility-directory -+Icon=preferences-desktop-accessibility diff --git a/sources b/sources index dcf2e02..873e32b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c14456bab069cf3315cf652a2aeed078 gnome-menus-2.23.5.tar.bz2 +bc921ce52815009498c63031933ff906 gnome-menus-2.23.6.tar.bz2