rpms/gnome-panel/devel .cvsignore, 1.71, 1.72 gnome-panel-2.21.5-ck-shutdown.patch, 1.1, 1.2 gnome-panel.spec, 1.274, 1.275 sources, 1.74, 1.75

William Jon McCann (mccann) fedora-extras-commits at redhat.com
Tue Mar 11 01:54:27 UTC 2008


Author: mccann

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

Modified Files:
	.cvsignore gnome-panel-2.21.5-ck-shutdown.patch 
	gnome-panel.spec sources 
Log Message:
- Update to 2.22.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	26 Feb 2008 17:36:45 -0000	1.71
+++ .cvsignore	11 Mar 2008 01:53:38 -0000	1.72
@@ -1 +1 @@
-gnome-panel-2.21.92.tar.bz2
+gnome-panel-2.22.0.tar.bz2

gnome-panel-2.21.5-ck-shutdown.patch:

Index: gnome-panel-2.21.5-ck-shutdown.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel-2.21.5-ck-shutdown.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.21.5-ck-shutdown.patch	25 Jan 2008 20:35:06 -0000	1.1
+++ gnome-panel-2.21.5-ck-shutdown.patch	11 Mar 2008 01:53:38 -0000	1.2
@@ -2,7 +2,7 @@
 ===================================================================
 --- gnome-panel/gnome-panel/panel-consolekit.c	(revision 0)
 +++ gnome-panel/gnome-panel/panel-consolekit.c	(revision 0)
-@@ -0,0 +1,597 @@
+@@ -0,0 +1,618 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2008 Jon McCann <jmccann at redhat.com>
@@ -84,9 +84,9 @@
 +
 +static void
 +panel_consolekit_get_property (GObject    *object,
-+				  guint       prop_id,
-+				  GValue     *value,
-+				  GParamSpec *pspec)
++			       guint       prop_id,
++			       GValue     *value,
++			       GParamSpec *pspec)
 +{
 +	PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
 +
@@ -233,7 +233,7 @@
 +					const char        *new_owner,
 +					PanelConsolekit *manager)
 +{
-+	if (strcmp (name, "org.freedesktop.ConsoleKit") != 0)
++	if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") != 0)
 +		return;
 +
 +	if (manager->priv->ck_proxy != NULL) {
@@ -269,6 +269,14 @@
 +
 +	parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
 +
++	if (manager->priv->bus_proxy != NULL) {
++		g_object_unref (manager->priv->bus_proxy);
++	}
++
++	if (manager->priv->ck_proxy != NULL) {
++		g_object_unref (manager->priv->ck_proxy);
++	}
++
 +	if (parent_class->finalize != NULL)
 +		parent_class->finalize (object);
 +}
@@ -340,16 +348,16 @@
 +
 +static void
 +emit_restart_complete (PanelConsolekit *manager,
-+		       GError          *error)
++		       const char      *error_message)
 +{
 +	GError *call_error;
 +
 +	call_error = NULL;
 +
-+	if (error != NULL) {
++	if (error_message != NULL) {
 +		call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
 +						  PANEL_CONSOLEKIT_ERROR_RESTARTING,
-+						  error->message);
++						  error_message);
 +	}
 +
 +	g_signal_emit (G_OBJECT (manager),
@@ -394,8 +402,7 @@
 +
 +	if (! gained_privilege) {
 +		if (error != NULL) {
-+			g_warning ("system restart error: %s", error->message);
-+			emit_restart_complete (manager, error);
++			emit_restart_complete (manager, error->message);
 +		}
 +		return;
 +	}
@@ -404,7 +411,7 @@
 +	res = try_system_restart (manager->priv->dbus_connection, &local_error);
 +	if (! res) {
 +		g_warning ("Unable to restart system: %s", local_error->message);
-+		emit_restart_complete (manager, local_error);
++		emit_restart_complete (manager, local_error->message);
 +		g_error_free (local_error);
 +		return;
 +	}
@@ -421,17 +428,16 @@
 +
 +	if (! gained_privilege) {
 +		if (error != NULL) {
-+			g_warning ("system restart error: %s", error->message);
-+			emit_restart_complete (manager, error);
++			emit_stop_complete (manager, error);
 +		}
 +		return;
 +	}
 +
 +	local_error = NULL;
-+	res = try_system_restart (manager->priv->dbus_connection, &local_error);
++	res = try_system_stop (manager->priv->dbus_connection, &local_error);
 +	if (! res) {
-+		g_warning ("Unable to restart system: %s", local_error->message);
-+		emit_restart_complete (manager, local_error);
++		g_warning ("Unable to stop system: %s", local_error->message);
++		emit_stop_complete (manager, local_error);
 +		g_error_free (local_error);
 +		return;
 +	}
@@ -459,62 +465,77 @@
 +request_restart_priv (PanelConsolekit *manager,
 +		      GError          *error)
 +{
-+	gboolean      res = FALSE;
 +#ifdef HAVE_POLKIT
++	gboolean      res = FALSE;
++	char         *error_message = NULL;
 +	PolKitAction *action;
 +	guint	      xid;
 +	pid_t	      pid;
++	GError       *local_error;
 +
 +	action = get_action_from_error (error);
 +
 +	xid = 0;
 +	pid = getpid ();
 +
-+	g_error_free (error);
-+	error = NULL;
++	local_error = NULL;
 +	res = polkit_gnome_auth_obtain (action,
 +					xid,
 +					pid,
 +					(PolKitGnomeAuthCB) system_restart_auth_cb,
 +					manager,
-+					&error);
++					&local_error);
 +	polkit_action_unref (action);
-+#endif /* HAVE POLKIT */
++	if (local_error != NULL) {
++		error_message = g_strdup (local_error->message);
++		g_error_free (local_error);
++	}
++
 +	if (! res) {
-+		emit_restart_complete (manager, error);
-+		g_error_free (error);
++		emit_restart_complete (manager, error_message);
++		g_free (error_message);
 +	}
++#else
++	g_assert_not_reached ();
++#endif /* HAVE POLKIT */
 +}
 +
 +static void
 +request_stop_priv (PanelConsolekit *manager,
 +		   GError          *error)
 +{
-+	gboolean      res = FALSE;
 +#ifdef HAVE_POLKIT
++	gboolean      res = FALSE;
++	char         *error_message = NULL;
 +	PolKitAction *action;
 +	guint	      xid;
 +	pid_t	      pid;
++	GError       *local_error;
 +
 +	action = get_action_from_error (error);
 +
 +	xid = 0;
 +	pid = getpid ();
 +
-+	g_error_free (error);
-+	error = NULL;
++	local_error = NULL;
 +	res = polkit_gnome_auth_obtain (action,
 +					xid,
 +					pid,
 +					(PolKitGnomeAuthCB) system_stop_auth_cb,
 +					manager,
-+					&error);
++					&local_error);
 +	polkit_action_unref (action);
-+#endif /* HAVE POLKIT */
++	if (local_error != NULL) {
++		error_message = g_strdup (local_error->message);
++		g_error_free (local_error);
++	}
 +	if (! res) {
-+		emit_stop_complete (manager, error);
-+		g_error_free (error);
++		emit_stop_complete (manager, error_message);
++		g_free (error_message);
 +	}
++#else
++	g_assert_not_reached ();
++#endif /* HAVE POLKIT */
 +}
 +
 +void
@@ -538,10 +559,9 @@
 +			request_restart_priv (manager, error);
 +		} else {
 +			emit_restart_complete (manager, error);
-+			g_error_free (error);
 +		}
++		g_error_free (error);
 +	}
-+
 +}
 +
 +void
@@ -565,8 +585,8 @@
 +			request_stop_priv (manager, error);
 +		} else {
 +			emit_stop_complete (manager, error);
-+			g_error_free (error);
 +		}
++		g_error_free (error);
 +	}
 +}
 +
@@ -574,7 +594,7 @@
 +panel_consolekit_can_restart (PanelConsolekit *manager)
 +{
 +#ifdef HAVE_POLKIT
-+	return TRUE;
++	return panel_consolekit_ensure_ck_connection (manager, NULL);
 +#else
 +	return FALSE;
 +#endif
@@ -584,7 +604,7 @@
 +panel_consolekit_can_stop (PanelConsolekit *manager)
 +{
 +#ifdef HAVE_POLKIT
-+	return TRUE;
++	return panel_consolekit_ensure_ck_connection (manager, NULL);
 +#else
 +	return FALSE;
 +#endif
@@ -595,8 +615,9 @@
 +{
 +	static PanelConsolekit *manager = NULL;
 +
-+	if (manager == NULL)
++	if (manager == NULL) {
 +		manager = panel_consolekit_new ();
++	}
 +
 +	return g_object_ref (manager);
 +}
@@ -684,7 +705,7 @@
 +#endif /* PANEL_CONSOLEKIT_H */
 Index: gnome-panel/gnome-panel/panel-logout.c
 ===================================================================
---- gnome-panel/gnome-panel/panel-logout.c	(revision 10754)
+--- gnome-panel/gnome-panel/panel-logout.c	(revision 10951)
 +++ gnome-panel/gnome-panel/panel-logout.c	(working copy)
 @@ -1,4 +1,5 @@
 -/*
@@ -693,7 +714,7 @@
   * panel-logout.c:
   *
   * Copyright (C) 2006 Vincent Untz
-@@ -33,6 +34,7 @@
+@@ -35,6 +36,7 @@
  #include "panel-logout.h"
  #include "panel-gdm.h"
  #include "panel-power-manager.h"
@@ -701,7 +722,7 @@
  #include "panel-session.h"
  #include "panel-icon-names.h"
  
-@@ -53,6 +55,7 @@ struct _PanelLogoutDialogPrivate {
+@@ -55,6 +57,7 @@ struct _PanelLogoutDialogPrivate {
  	PanelLogoutDialogType type;
  
  	PanelPowerManager    *power_manager;
@@ -709,7 +730,7 @@
  
  	int                   timeout;
  	unsigned int          timeout_id;
-@@ -74,7 +77,7 @@ enum {
+@@ -76,7 +79,7 @@ enum {
  };
  G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
  
@@ -718,7 +739,7 @@
  panel_logout_set_property (GObject      *object,
  			   guint         prop_id,
  			   const GValue *value,
-@@ -89,7 +92,7 @@ panel_logout_set_property (GObject      
+@@ -91,7 +94,7 @@ panel_logout_set_property (GObject      
  	}
  }
  
@@ -727,15 +748,78 @@
  panel_logout_get_property (GObject     *object,
  			   guint        prop_id,
  			   GValue      *value,
-@@ -142,6 +145,7 @@ panel_logout_init (PanelLogoutDialog *lo
- 	gtk_window_stick (GTK_WINDOW (logout_dialog));
+@@ -130,6 +133,59 @@ panel_logout_class_init (PanelLogoutDial
+ }
+ 
+ static void
++ck_restart_error_window (GError *error)
++{
++	GtkWidget  *dialog;
++	const char *primary;
++
++	g_assert (error != NULL);
++
++	switch (error->code) {
++	case PANEL_CONSOLEKIT_ERROR_RESTARTING:
++		primary = _("Unable to restart system");
++		break;
++	case PANEL_CONSOLEKIT_ERROR_STOPPING:
++		primary = _("Unable to stop system");
++		break;
++	default:
++		g_assert_not_reached ();
++	}
++
++	dialog = gtk_message_dialog_new (NULL, 0,
++					 GTK_MESSAGE_ERROR,
++					 GTK_BUTTONS_NONE,
++					 primary);
++
++	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++						  "%s", error->message);
++
++	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++				GTK_STOCK_CLOSE,
++				NULL);
++
++	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
++					 GTK_RESPONSE_CLOSE);
++	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
++	gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++	g_signal_connect (dialog, "response",
++			  G_CALLBACK (gtk_widget_destroy), NULL);
++
++	gtk_widget_show (dialog);
++}
++
++static void
++on_ck_request_completed (PanelConsolekit *panel_consolekit,
++			 GError          *error)
++{
++	if (error == NULL) {
++		/* request was successful */
++		return;
++	}
++
++}
++
++static void
+ panel_logout_init (PanelLogoutDialog *logout_dialog)
+ {
+ 	logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
+@@ -146,6 +202,10 @@ panel_logout_init (PanelLogoutDialog *lo
+ 				 GTK_WIN_POS_CENTER_ALWAYS);
  
  	logout_dialog->priv->power_manager = panel_get_power_manager ();
 +	logout_dialog->priv->consolekit = panel_get_consolekit ();
++	g_signal_connect (logout_dialog->priv->consolekit,
++			  "request-completed",
++			  G_CALLBACK (on_ck_request_completed), NULL);
  
  	g_signal_connect (logout_dialog, "destroy",
  			  G_CALLBACK (panel_logout_destroy), NULL);
-@@ -159,37 +163,91 @@ panel_logout_destroy (PanelLogoutDialog 
+@@ -163,37 +223,120 @@ panel_logout_destroy (PanelLogoutDialog 
  
  	g_object_unref (logout_dialog->priv->power_manager);
  	logout_dialog->priv->power_manager = NULL;
@@ -751,7 +835,7 @@
 +	gboolean ret;
 +
 +	ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
-+	if (! ret) {
++	if (!ret) {
 +		ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
 +	}
 +	return ret;
@@ -763,12 +847,37 @@
 +	gboolean ret;
 +
 +	ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
-+	if (! ret) {
++	if (!ret) {
 +		ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
 +	}
 +	return ret;
 +}
 +
++gboolean
++panel_logout_supports_shutdown_reboot (void)
++{
++	PanelConsolekit *consolekit;
++	gboolean         ret;
++
++	ret = FALSE;
++
++	/* if we can do any then return true */
++
++	consolekit = panel_get_consolekit ();
++	if (consolekit != NULL) {
++		ret = panel_consolekit_can_restart (consolekit)
++			|| panel_consolekit_can_stop (consolekit);
++		g_object_unref (consolekit);
++	}
++
++	if (!ret) {
++		ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)
++			|| gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++	}
++
++	return ret;
++}
++
 +static void
 +do_request_logout (PanelConsolekit *consolekit)
 +{
@@ -780,6 +889,8 @@
 +do_request_reboot (PanelConsolekit *consolekit)
 +{
 +	if (panel_consolekit_can_restart (consolekit)) {
++		gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++		panel_session_request_save ();
 +		panel_consolekit_attempt_restart (consolekit);
 +	} else {
 +		gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
@@ -791,6 +902,8 @@
 +do_request_shutdown (PanelConsolekit *consolekit)
 +{
 +	if (panel_consolekit_can_stop (consolekit)) {
++		gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++		panel_session_request_save ();
 +		panel_consolekit_attempt_stop (consolekit);
 +	} else {
 +		gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
@@ -833,7 +946,7 @@
  		break;
  	case PANEL_LOGOUT_RESPONSE_STD:
  		if (panel_power_manager_can_hibernate (power_manager))
-@@ -206,6 +264,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -210,6 +353,7 @@ panel_logout_response (PanelLogoutDialog
  		g_assert_not_reached ();
  	}
  	g_object_unref (power_manager);
@@ -841,7 +954,7 @@
  }
  
  static gboolean
-@@ -357,7 +416,7 @@ panel_logout_new (PanelLogoutDialogType 
+@@ -361,7 +505,7 @@ panel_logout_new (PanelLogoutDialogType 
  					       _("_Hibernate"),
  					       PANEL_LOGOUT_RESPONSE_STD);
  
@@ -850,7 +963,7 @@
  			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
  					       _("_Restart"),
  					       PANEL_LOGOUT_RESPONSE_REBOOT);
-@@ -366,7 +425,7 @@ panel_logout_new (PanelLogoutDialogType 
+@@ -370,7 +514,7 @@ panel_logout_new (PanelLogoutDialogType 
  				       GTK_STOCK_CANCEL,
  				       GTK_RESPONSE_CANCEL);
  
@@ -859,9 +972,93 @@
  			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
  					       _("_Shut Down"),
  					       PANEL_LOGOUT_RESPONSE_SHUTDOWN);
+Index: gnome-panel/gnome-panel/panel-logout.h
+===================================================================
+--- gnome-panel/gnome-panel/panel-logout.h	(revision 10951)
++++ gnome-panel/gnome-panel/panel-logout.h	(working copy)
+@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
+ 
+ GType  panel_logout_get_type          (void) G_GNUC_CONST;	
+ 
++gboolean panel_logout_supports_shutdown_reboot (void);
++
+ void panel_logout_new (PanelLogoutDialogType  type,
+ 		       GdkScreen             *screen,
+ 		       guint32                activate_time);
+Index: gnome-panel/gnome-panel/panel-toplevel.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-toplevel.c	(revision 10951)
++++ gnome-panel/gnome-panel/panel-toplevel.c	(working copy)
+@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
+ }
+ 
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_start_animation (PanelToplevel *toplevel,
++				gboolean       auto_hide)
+ {
+ 	GdkScreen *screen;
+ 	int        monitor_width, monitor_height;
+@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel    *t
+ 	}
+ 
+ 	if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+-		panel_toplevel_start_animation (toplevel);
++		panel_toplevel_start_animation (toplevel, auto_hide);
+ 	else if (toplevel->priv->attached)
+ 		gtk_widget_hide (GTK_WIDGET (toplevel));
+ 
+@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
+ 		panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
+ 
+ 	if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+-		panel_toplevel_start_animation (toplevel);
++		panel_toplevel_start_animation (toplevel, FALSE);
+ 	else if (toplevel->priv->attached)
+ 		gtk_widget_show (GTK_WIDGET (toplevel));
+ 
+Index: gnome-panel/gnome-panel/panel-session.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-session.c	(revision 10951)
++++ gnome-panel/gnome-panel/panel-session.c	(working copy)
+@@ -60,6 +60,34 @@ panel_session_request_logout (void)
+ 	recursion_guard--;
+ }
+ 
++void
++panel_session_request_save (void)
++{
++	GnomeClient *client;
++	static int   recursion_guard = 0;
++
++	if (recursion_guard)
++		return;
++
++	recursion_guard++;
++
++	if (!(client = gnome_master_client ()))
++		return;
++
++	/* Only request a Global save. We only want a Local
++	 * save if the user selects 'Save current setup'
++	 * from the dialog.
++	 */
++	gnome_client_request_save (client,
++				   GNOME_SAVE_GLOBAL,
++				   FALSE,
++				   GNOME_INTERACT_NONE,
++				   TRUE, /* do not use the gnome-session gui */
++				   TRUE);
++
++	recursion_guard--;
++}
++
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
 Index: gnome-panel/gnome-panel/panel-action-button.c
 ===================================================================
---- gnome-panel/gnome-panel/panel-action-button.c	(revision 10754)
+--- gnome-panel/gnome-panel/panel-action-button.c	(revision 10951)
 +++ gnome-panel/gnome-panel/panel-action-button.c	(working copy)
 @@ -46,7 +46,6 @@
  #include "panel-lockdown.h"
@@ -871,20 +1068,31 @@
  #include "panel-icon-names.h"
  
  G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
-@@ -182,9 +181,7 @@ panel_action_shutdown (GtkWidget *widget
- static gboolean
+@@ -183,8 +182,7 @@ static gboolean
  panel_action_shutdown_reboot_is_disabled (void)
  {
--	return (panel_lockdown_get_disable_log_out() ||
+ 	return (panel_lockdown_get_disable_log_out() ||
 -	(!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
 -	 !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+	return (panel_lockdown_get_disable_log_out());
++		!panel_logout_supports_shutdown_reboot);
  }
  
  /* Run Application
+Index: gnome-panel/gnome-panel/panel-session.h
+===================================================================
+--- gnome-panel/gnome-panel/panel-session.h	(revision 10951)
++++ gnome-panel/gnome-panel/panel-session.h	(working copy)
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ void panel_session_init           (void);
+ void panel_session_do_not_restart (void);
+ void panel_session_request_logout (void);
++void panel_session_request_save   (void);
+ 
+ G_END_DECLS
+ 
 Index: gnome-panel/gnome-panel/Makefile.am
 ===================================================================
---- gnome-panel/gnome-panel/Makefile.am	(revision 10754)
+--- gnome-panel/gnome-panel/Makefile.am	(revision 10951)
 +++ gnome-panel/gnome-panel/Makefile.am	(working copy)
 @@ -16,6 +16,7 @@ INCLUDES =							\
  	$(STANDARD_PROPERTIES_CFLAGS)				\
@@ -900,17 +1108,17 @@
  	panel-power-manager.c   \
 +	panel-consolekit.c	\
  	panel-ditem-editor.c	\
+ 	panel-mount-operation.c	\
  	$(NULL)
- 
-@@ -147,6 +149,7 @@ panel_headers =			\
+@@ -148,6 +150,7 @@ panel_headers =			\
  	panel-logout.h		\
  	panel-gdm.h		\
  	panel-power-manager.h	\
 +	panel-consolekit.h	\
  	panel-ditem-editor.h	\
  	panel-icon-names.h	\
- 	$(NULL)
-@@ -159,6 +162,7 @@ gnome_panel_SOURCES =			\
+ 	panel-mount-operation.h	\
+@@ -161,6 +164,7 @@ gnome_panel_SOURCES =			\
  
  gnome_panel_LDADD =		\
  	$(PANEL_LIBS)		\


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- gnome-panel.spec	9 Mar 2008 21:25:43 -0000	1.274
+++ gnome-panel.spec	11 Mar 2008 01:53:38 -0000	1.275
@@ -21,10 +21,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.21.92
+Version: 2.22.0
 Release: 6%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -107,11 +107,9 @@
 # add a hard dependency on e.g. tomboy 
 Patch11: applet-error.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=511881
 Patch14: gnome-panel-2.21.5-ck-shutdown.patch
 
-Patch22: polkit-fix.patch
-Patch23: sunrise.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
@@ -164,8 +162,6 @@
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch14 -p1 -b .ck-shutdown
-%patch22 -p1 -b .polkit-fix
-%patch23 -p1 -b .sunrise
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch25 -p1 -b .current
 %patch26 -p1 -b .expose
@@ -353,6 +349,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Mar 10 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
 * Sat Mar  8 2008 Will Woods <wwoods at redhat.com> - 2.21.92-6
 - Add "About This Computer" item to System menu if it exists
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	26 Feb 2008 17:36:45 -0000	1.74
+++ sources	11 Mar 2008 01:53:38 -0000	1.75
@@ -1 +1 @@
-46544232bc0148ff61790f9141a6904b  gnome-panel-2.21.92.tar.bz2
+fe10c920c1f182a2bd5dba98863c786c  gnome-panel-2.22.0.tar.bz2




More information about the fedora-extras-commits mailing list