rpms/gnome-panel/devel .cvsignore, 1.80, 1.81 gnome-panel.spec, 1.311, 1.312 preferred-apps.patch, 1.7, 1.8 sources, 1.83, 1.84 gnome-panel-2.13.5-switch-user.patch, 1.3, NONE gnome-panel-2.19.5-vendor.patch, 1.1, NONE gnome-panel-2.22.0-ck-shutdown.patch, 1.3, NONE gnome-panel-larger-find-window.patch, 1.1, NONE gnome-panel-launch-with-gio.patch, 1.3, NONE gnome-panel-use-gio.patch, 1.1, NONE icon-names.patch, 1.2, NONE timezone-debug.patch, 1.2, NONE

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Aug 5 16:44:47 UTC 2008


Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec preferred-apps.patch sources 
Removed Files:
	gnome-panel-2.13.5-switch-user.patch 
	gnome-panel-2.19.5-vendor.patch 
	gnome-panel-2.22.0-ck-shutdown.patch 
	gnome-panel-larger-find-window.patch 
	gnome-panel-launch-with-gio.patch gnome-panel-use-gio.patch 
	icon-names.patch timezone-debug.patch 
Log Message:
2.23.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	23 Jul 2008 02:44:59 -0000	1.80
+++ .cvsignore	5 Aug 2008 16:44:17 -0000	1.81
@@ -1 +1 @@
-gnome-panel-2.23.5.tar.bz2
+gnome-panel-2.23.6.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- gnome-panel.spec	23 Jul 2008 16:39:29 -0000	1.311
+++ gnome-panel.spec	5 Aug 2008 16:44:17 -0000	1.312
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.23.5
-Release: 2%{?dist}
+Version: 2.23.6
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
 
@@ -110,13 +110,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
-# fixed upstream
-Patch28: gnome-panel-larger-find-window.patch
-
-Patch33: gnome-panel-use-gio.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=529243
-Patch34: gnome-panel-launch-with-gio.patch
-
 Patch35: clock-wakeups.patch
 
 Conflicts: gnome-power-manager < 2.15.3
@@ -164,9 +157,6 @@
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
-%patch28 -p1 -b .larger-find-window
-%patch33 -p1 -b .use-gio
-%patch34 -p1 -b .launch-with-gio
 %patch35 -p1 -b .clock-wakeups
 
 . %{SOURCE6}
@@ -354,6 +344,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Aug  5 2008 Matthias Clasen  <mclasen at redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.23.5-2
 - fix license tag
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- preferred-apps.patch	23 Jul 2008 02:44:59 -0000	1.7
+++ preferred-apps.patch	5 Aug 2008 16:44:17 -0000	1.8
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.c
---- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps	2008-07-22 22:20:48.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/launcher.c	2008-07-22 22:36:59.000000000 -0400
-@@ -23,6 +23,7 @@
+diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.6/gnome-panel/launcher.c
+--- gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps	2008-08-05 12:31:49.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/launcher.c	2008-08-05 12:35:46.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <gio/gio.h>
  #include <libgnome/gnome-util.h>
- #include <libgnomeui/gnome-url.h>
  #include <gdk/gdkx.h>
 +#include <gmenu-tree.h>
  
+ #include <libpanel-util/panel-error.h>
  #include <libpanel-util/panel-glib.h>
- #include <libpanel-util/panel-keyfile.h>
-@@ -43,6 +44,7 @@
+@@ -44,6 +45,7 @@
  #include "panel-compatibility.h"
  #include "panel-ditem-editor.h"
  #include "panel-icon-names.h"
@@ -17,7 +17,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1282,3 +1284,173 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -191,9 +191,9 @@
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.h
---- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps	2008-07-22 22:20:48.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/launcher.h	2008-07-22 22:20:49.000000000 -0400
+diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.6/gnome-panel/launcher.h
+--- gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps	2008-08-05 12:31:49.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/launcher.h	2008-08-05 12:31:49.000000000 -0400
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -211,9 +211,9 @@
  
  G_END_DECLS
  
-diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps gnome-panel-2.23.5/gnome-panel/main.c
---- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps	2008-07-22 17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/main.c	2008-07-22 22:20:49.000000000 -0400
+diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps gnome-panel-2.23.6/gnome-panel/main.c
+--- gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps	2008-08-04 16:43:10.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/main.c	2008-08-05 12:31:49.000000000 -0400
 @@ -28,6 +28,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -230,10 +230,10 @@
  	panel_global_config_load ();
  	panel_lockdown_init ();
  	panel_profile_load ();
-diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps	2008-07-22 17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c	2008-07-22 22:20:49.000000000 -0400
-@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
+diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps	2008-08-04 16:43:10.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c	2008-08-05 12:31:49.000000000 -0400
+@@ -797,7 +797,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }
  
@@ -242,9 +242,9 @@
  get_all_applications (void)
  {
  	GMenuTree          *tree;
-diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps	2008-07-22 17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h	2008-07-22 22:20:49.000000000 -0400
+diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps	2008-08-04 16:43:10.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h	2008-08-05 12:31:49.000000000 -0400
 @@ -32,6 +32,8 @@ G_BEGIN_DECLS
  void panel_run_dialog_present           (GdkScreen  *screen,
  					 guint32    activate_time);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	23 Jul 2008 02:44:59 -0000	1.83
+++ sources	5 Aug 2008 16:44:17 -0000	1.84
@@ -1 +1 @@
-075172fb7a72e8a35df50e99a5a826af  gnome-panel-2.23.5.tar.bz2
+6204b45029b79deeb6b05e46b7c2908d  gnome-panel-2.23.6.tar.bz2


--- gnome-panel-2.13.5-switch-user.patch DELETED ---


--- gnome-panel-2.19.5-vendor.patch DELETED ---


--- gnome-panel-2.22.0-ck-shutdown.patch DELETED ---


--- gnome-panel-larger-find-window.patch DELETED ---


--- gnome-panel-launch-with-gio.patch DELETED ---


--- gnome-panel-use-gio.patch DELETED ---


--- icon-names.patch DELETED ---


--- timezone-debug.patch DELETED ---




More information about the fedora-extras-commits mailing list