Mon Jul 9 04:31:21 UTC 2007

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1574

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.19.5-vendor.patch 
Removed Files:
	gnome-panel-2.13.91-ignore-unknown-options.patch 
	gnome-panel-2.14.2-xio-error.patch 
	gnome-panel-2.17.91-vendor.patch 
	gnome-panel-2.17.92-move-suspend-to-menu.patch 
	gnome-panel-2.18.0-fix-invalid-read.patch 
	gnome-panel-2.18.0-fix-name-too-long-error.patch 
	gnome-panel-2.18.0-fix-tasks.patch 
	gnome-panel-2.18.0-hide-menu-if-root.patch 
	gnome-panel-2.18.0-update-clock-immediately.patch 
Log Message:
2.19.5


gnome-panel-2.19.5-vendor.patch:

--- NEW FILE gnome-panel-2.19.5-vendor.patch ---
--- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.vendor	2007-02-07 00:18:07.000000000 -0500
+++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c	2007-02-07 01:07:52.000000000 -0500
@@ -611,7 +611,7 @@
 					      COMPUTER_NAME_KEY,
 					      NULL);
 	panel_menu_items_append_from_desktop (places_menu,
-					      "nautilus-computer.desktop",
+					      "gnome-nautilus-computer.desktop",
 					      gconf_name);
 	if (gconf_name)
 		g_free (gconf_name);
@@ -624,7 +624,7 @@
 	add_menu_separator (places_menu);
 
 	panel_menu_items_append_from_desktop (places_menu,
-					      "network-scheme.desktop",
+					      "gnome-network-scheme.desktop",
 					      NULL);
 	panel_place_menu_item_append_volumes (places_menu, TRUE);
 
@@ -715,7 +715,7 @@
 	if (add_separator)
 		add_menu_separator (menu);
 
-	panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL);
+	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
 
 	if (parent->priv->append_lock_logout)


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- gnome-panel.spec	9 Jul 2007 04:00:40 -0000	1.204
+++ gnome-panel.spec	9 Jul 2007 04:30:46 -0000	1.205
@@ -8,7 +8,7 @@
 %define libbonoboui_version 2.3.0
 %define orbit_version 2.4.0
 %define gnome_vfs2_version 2.14.2
-%define libwnck_version 2.19.3
+%define libwnck_version 2.19.5
 %define gconf_version 2.14
 %define gnome_menus_version 2.11.1
 %define evolution_data_server_version 1.9.1
@@ -81,23 +81,15 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 
-Patch0: gnome-panel-2.17.91-vendor.patch
-Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch5: gnome-panel-2.17.91-about-fedora.patch
-Patch6: gnome-panel-2.13.5-switch-user.patch
-Patch8: gnome-panel-2.16.1-search.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=399270
-Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=399274
-Patch12: gnome-panel-2.14.2-xio-error.patch
-Patch13: gnome-panel-2.19.2-move-suspend-to-menu.patch
-Patch15: gnome-panel-2.16.0-compiz-support.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=424545
-Patch18: gnome-panel-2.18.0-hide-menu-if-root.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=426281
-Patch20: gnome-panel-2.18.0-fix-name-too-long-error.patch
+Patch0: gnome-panel-2.19.5-vendor.patch
+Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
+Patch2: gnome-panel-2.17.91-about-fedora.patch
+Patch3: gnome-panel-2.13.5-switch-user.patch
+Patch4: gnome-panel-2.16.1-search.patch
+Patch5: gnome-panel-2.19.2-move-suspend-to-menu.patch
+# Drop this patch for now, it should have AT LEAST been moved
+# to an upstream bugzilla by now
+#Patch6: gnome-panel-2.16.0-compiz-support.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -124,16 +116,12 @@
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .vendor
-%patch2 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch5 -p1 -b .about-fedora
-%patch6 -p1 -b .switch-user
-%patch8 -p1 -b .search
-%patch9 -p1 -b .ignore-unknown-options
-%patch12 -p1 -b .xio-error
-%patch13 -p1 -b .move-suspend-to-menu
-%patch15 -p0 -b .compiz-support
-%patch18 -p1 -b .hide-lock-menu-if-root
-%patch20 -p1 -b .fix-name-too-long-error
+%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
+%patch2 -p1 -b .about-fedora
+%patch3 -p1 -b .switch-user
+%patch4 -p1 -b .search
+%patch5 -p1 -b .move-suspend-to-menu
+#%patch6 -p0 -b .compiz-support
 
 . %{SOURCE4}
 


--- gnome-panel-2.13.91-ignore-unknown-options.patch DELETED ---


--- gnome-panel-2.14.2-xio-error.patch DELETED ---


--- gnome-panel-2.17.91-vendor.patch DELETED ---


--- gnome-panel-2.17.92-move-suspend-to-menu.patch DELETED ---


--- gnome-panel-2.18.0-fix-invalid-read.patch DELETED ---


--- gnome-panel-2.18.0-fix-name-too-long-error.patch DELETED ---


--- gnome-panel-2.18.0-fix-tasks.patch DELETED ---


--- gnome-panel-2.18.0-hide-menu-if-root.patch DELETED ---


--- gnome-panel-2.18.0-update-clock-immediately.patch DELETED ---


