--- a/ChangeLog	Tue Sep 23 01:45:27 2008 +0000
+++ b/ChangeLog	Tue Sep 23 03:26:15 2008 +0000
@@ -1,3 +1,14 @@
+2008-09-23  simon.zheng  <[email protected]>
+
+	* base-specs/glibmm.spec: Bump to 2.18.0.
+	* base-specs/libsoup.spec: Bump to 2.24.0.
+	* base-specs/gnome-power-manager.spec: Bump to 2.24.0.
+	* patches/gnome-power-manager-01-build.diff: Rework.
+	* patches/gnome-power-manager-04-authorization.diff: Rework.
+	* patches/gnome-power-manager-06-interactive-dialog.diff: Rework.
+	* patches/gnome-power-manager-07-screensaver.diff: Rework.
+	* patches/gnome-power-manager-08-cpufreq.diff: Rework.
+
 2008-09-23  simon.zheng  <[email protected]>
 
 	* base-specs/devhelp.spec: Bump to 0.21.

--- a/base-specs/glibmm.spec	Tue Sep 23 01:45:27 2008 +0000
+++ b/base-specs/glibmm.spec	Tue Sep 23 03:26:15 2008 +0000
@@ -12,13 +12,13 @@
 Name:                    glibmm
 License:        	 LGPL
 Group:                   System/Libraries
-Version:                 2.17.3
+Version:                 2.18.0
 Release:                 1
 Distribution:            Java Desktop System
 Vendor:                  Sun Microsystems, Inc.
 Summary:                 glibmm - C++ Wrapper for the Glib2 Library
 URL:                     http://www.gtkmm.org/
-Source:                  http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.17/%{name}-%{version}.tar.bz2
+Source:                  http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/%{name}-%{version}.tar.bz2
 # date:2008-02-14 owner:xz159989 type:feature
 Patch1:                  glibmm-01-build.diff
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -74,6 +74,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 23 2008 - [email protected]
+- Bump to 2.18.0.
 * Fri Sep 05 2008 - [email protected]
 - Bump to 2.17.3.
 * Mon Aug 07 2008 - [email protected]

--- a/base-specs/gnome-power-manager.spec	Tue Sep 23 01:45:27 2008 +0000
+++ b/base-specs/gnome-power-manager.spec	Tue Sep 23 03:26:15 2008 +0000
@@ -11,12 +11,12 @@
 Name:           gnome-power-manager
 License:        GPL
 Group:		X11/Applications
-Version:        2.23.91
+Version:        2.24.0
 Release:        2
 Distribution:   Java Desktop System
 Vendor:         Sun Microsystems, Inc.
 Summary:	GNOME Power Manager
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.23/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.24/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:        l10n-configure.sh
 %endif
@@ -168,6 +168,8 @@
 
 
 %changelog
+* Tue Sep 23 2008 - [email protected]
+- Bump to 2.24.0.
 * Fri Sep 19 2008 - [email protected]
 - Rework 07-screensaver.diff to fix bugster #6750004.
 - Add 10-brightness-progressbar.diff to fix bugzilla #552762.

--- a/base-specs/libsoup.spec	Tue Sep 23 01:45:27 2008 +0000
+++ b/base-specs/libsoup.spec	Tue Sep 23 03:26:15 2008 +0000
@@ -10,12 +10,12 @@
 Name:         libsoup
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.23.92
+Version:      2.24.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Library for SOAP support in Evolution
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.23/libsoup-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.24/libsoup-%{version}.tar.bz2
 URL:          http://www.gnome.org
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -99,6 +99,8 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Tue Sep 23 2008 - [email protected]
+- Bump to 2.24.0.
 * Tue Sep 09 2008 - [email protected]
 - Bump to 2.23.92.
 * Tue Sep 02 2008 - [email protected]

--- a/patches/gnome-power-manager-01-build.diff	Tue Sep 23 01:45:27 2008 +0000
+++ b/patches/gnome-power-manager-01-build.diff	Tue Sep 23 03:26:15 2008 +0000
@@ -34,22 +34,6 @@
  							 guint		 i,
  							 gfloat		 value);
  
-diff -Nur gnome-power-manager-2.21.1-org/src/gpm-debug.h gnome-power-manager-2.21.1/src/gpm-debug.h
---- gnome-power-manager-2.21.1-org/src/gpm-debug.h	2007-12-17 17:12:56.284090000 +0800
-+++ gnome-power-manager-2.21.1/src/gpm-debug.h	2007-12-17 17:02:07.650493000 +0800
-@@ -28,7 +28,7 @@
- 
- G_BEGIN_DECLS
- 
--#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199409L
- #define gpm_debug(...) gpm_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
- #define gpm_warning(...) gpm_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
- #define gpm_error(...) gpm_error_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-+dnl ---------------------------------------------------------------------------
- dnl - Where should we put documentation ?
- dnl ---------------------------------------------------------------------------
- AC_ARG_WITH(doc-dir,
 --- gnome-power-manager-2.23.91/configure.ac.orig	2008-09-02 10:39:13.239161437 +0800
 +++ gnome-power-manager-2.23.91/configure.ac	2008-09-02 10:39:31.005118555 +0800
 @@ -246,7 +246,7 @@
@@ -61,3 +45,33 @@
  
  AC_MSG_CHECKING([whether to support gconf defaults])
  have_gconfdefaults=no
+--- gnome-power-manager-2.24.0/src/egg-debug.h.orig	2008-09-23 10:39:26.172843000 +0800
++++ gnome-power-manager-2.24.0/src/egg-debug.h	2008-09-23 10:39:58.561354000 +0800
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199409L
+ /**
+  * egg_debug:
+  *
+@@ -66,15 +66,15 @@
+ void		egg_debug_real			(const gchar	*func,
+ 						 const gchar	*file,
+ 						 int		 line,
+-						 const gchar	*format, ...) __attribute__((format (printf,4,5)));
++						 const gchar	*format, ...);
+ void		egg_warning_real		(const gchar	*func,
+ 						 const gchar	*file,
+ 						 int		 line,
+-						 const gchar	*format, ...) __attribute__((format (printf,4,5)));
++						 const gchar	*format, ...);
+ void		egg_error_real			(const gchar	*func,
+ 						 const gchar	*file,
+ 						 int		 line,
+-						 const gchar	*format, ...) __attribute__((format (printf,4,5)));
++						 const gchar	*format, ...);
+ 
+ G_END_DECLS
+ 

--- a/patches/gnome-power-manager-04-authorization.diff	Tue Sep 23 01:45:27 2008 +0000
+++ b/patches/gnome-power-manager-04-authorization.diff	Tue Sep 23 03:26:15 2008 +0000
@@ -48,12 +48,12 @@
 +	dbus_error_init (&error);
 + 	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 + 	if (connection == NULL) {
-+ 		gpm_warning ("Cannot connect to system message bus");
++ 		egg_warning ("Cannot connect to system message bus");
 + 		return FALSE;
 + 	}
 +	ctx = libpolkit_new_context (connection);
 +	if (ctx == NULL) {
-+		gpm_warning ("Cannot get libpolkit context");
++		egg_warning ("Cannot get libpolkit context");
 +		return FALSE;	
 +	}
 +	pw = getpwnam(user);
@@ -69,11 +69,11 @@
 +                                                   NULL)
 +                                                   != LIBPOLKIT_RESULT_OK) {
 +		/* abort as calling libpolkit failed */
-+		gpm_warning ("Cannot lookup privilege from libpolkit\n");
++		egg_warning ("Cannot lookup privilege from libpolkit\n");
 +	}
 +
 +	if (out_is_allowed == FALSE) {
-+		gpm_debug ("The user don't possess privilege \"%s\"\n", privilege);
++		egg_debug ("The user don't possess privilege \"%s\"\n", privilege);
 +		ret = FALSE;
 +	}
 + 	if (ctx != NULL)
@@ -158,7 +158,7 @@
  	}
 @@ -1142,6 +1157,19 @@
  	prefs->priv->can_hibernate = gpm_dbus_method_bool ("CanHibernate");
- 	gpm_debug ("caps=%i", caps);
+ 	egg_debug ("caps=%i", caps);
  
 +#if defined(sun) && defined(__SVR4)
 +	GpmControl *control = gpm_control_new ();

--- a/patches/gnome-power-manager-06-interactive-dialog.diff	Tue Sep 23 01:45:27 2008 +0000
+++ b/patches/gnome-power-manager-06-interactive-dialog.diff	Tue Sep 23 03:26:15 2008 +0000
@@ -23,7 +23,7 @@
 +	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 +	if (connection == NULL) {
 +		if (error) {
-+			gpm_warning ("Couldn't connect to PowerManager %s",
++			egg_warning ("Couldn't connect to PowerManager %s",
 +				     error->message);
 +			g_error_free (error);
 +		}
@@ -52,7 +52,7 @@
 -					   GNOME_SAVE_GLOBAL,
 -					   TRUE, GNOME_INTERACT_ANY, FALSE, TRUE);
 +		if (gpm_manager_action_interactive (manager) == FALSE)
-+			gpm_warning ("Couldn't ask for interactive dialog from session manager");
++			egg_warning ("Couldn't ask for interactive dialog from session manager");
  	} else {
- 		gpm_warning ("unknown action %s", action);
+ 		egg_warning ("unknown action %s", action);
  	}

--- a/patches/gnome-power-manager-07-screensaver.diff	Tue Sep 23 01:45:27 2008 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff	Tue Sep 23 03:26:15 2008 +0000
@@ -27,14 +27,14 @@
  	gboolean use_ss_setting;
 +#if defined(sun) && defined(__SVR4)
 +	gpm_conf_get_bool (control->priv->conf, GPM_CONF_UI_ENABLE_SCREEN_LOCK, &do_lock);
-+	gpm_debug ("Using custom locking settings (%i)", do_lock);
++	egg_debug ("Using custom locking settings (%i)", do_lock);
 +#else
  	/* This allows us to over-ride the custom lock settings set in gconf
  	   with a system default set in gnome-screensaver.
  	   See bug #331164 for all the juicy details. :-) */
 @@ -388,6 +392,7 @@
  		gpm_conf_get_bool (control->priv->conf, policy, &do_lock);
- 		gpm_debug ("Using custom locking settings (%i)", do_lock);
+ 		egg_debug ("Using custom locking settings (%i)", do_lock);
  	}
 +#endif
  	return do_lock;
@@ -55,7 +55,7 @@
 @@ -29,6 +29,10 @@
  #include "gpm-conf.h"
  #include "gpm-screensaver.h"
- #include "gpm-debug.h"
+ #include "egg-debug.h"
 +#if defined(sun) && defined(__SVR4)
 +#include <gtk/gtk.h>
 +#include <gdk/gdk.h>
@@ -77,7 +77,7 @@
 +	command = g_strdup ("/usr/bin/xdg-screensaver lock");	
 +	screen = gdk_screen_get_default ();
 +
-+	gpm_debug ("Doing xdg-screensaver lock");
++	egg_debug ("Doing xdg-screensaver lock");
 +	if (! gdk_spawn_command_line_on_screen (screen, command, &error)) {
 +		g_warning ("Cannot lock screen: %s", error->message);
 +		g_error_free (error);
@@ -90,7 +90,7 @@
 +	invisible = gtk_invisible_new_for_screen (screen);
 +	gtk_widget_show (invisible);
 +	while (sleepcount++ < 50) {
-+		gpm_debug ("Try to determine if screen lock is active!");
++		egg_debug ("Try to determine if screen lock is active!");
 +		if (gdk_pointer_grab (invisible->window, 
 +				TRUE, 
 +				0,
@@ -108,7 +108,7 @@
 +		g_usleep (1000 * 100);
 +	} 
 +	gtk_widget_destroy (invisible);
-+	gpm_debug ("Screen locking is sucessful!, sleepcount = %d", sleepcount);
++	egg_debug ("Screen locking is sucessful!, sleepcount = %d", sleepcount);
 +#else
  	g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
  

--- a/patches/gnome-power-manager-08-cpufreq.diff	Tue Sep 23 01:45:27 2008 +0000
+++ b/patches/gnome-power-manager-08-cpufreq.diff	Tue Sep 23 03:26:15 2008 +0000
@@ -1038,7 +1038,7 @@
 +
 +#include "gpm-ac-adapter.h"
 +#include "gpm-conf.h"
-+#include "gpm-debug.h"
++#include "egg-debug.h"
 +#include "gpm-cpufreq.h"
 +
 +static void     gpm_cpufreq_class_init (GpmCpufreqClass *klass);
@@ -1322,7 +1322,7 @@
 +
 +	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
 +	if (value == NULL) {
-+		gpm_warning ("active text failed");
++		egg_warning ("active text failed");
 +		return;
 +	}
 +	if (strcmp (value, CPUFREQ_ONDEMAND_TEXT) == 0) {
@@ -1341,7 +1341,7 @@
 +
 +	g_free (value);
 +	gpm_pref_key = (char *) g_object_get_data (G_OBJECT (widget), "conf_key");
-+	gpm_debug ("Changing %s to %s", gpm_pref_key, policy);
++	egg_debug ("Changing %s to %s", gpm_pref_key, policy);
 +	gpm_conf_set_string (prefs->priv->conf, gpm_pref_key, policy);
 +}
 +
@@ -1372,7 +1372,7 @@
 +	gtk_widget_set_sensitive (widget, is_writable);
 +
 +	if (value == NULL) {
-+		gpm_warning ("invalid schema, please re-install");
++		egg_warning ("invalid schema, please re-install");
 +		value = g_strdup ("nothing");
 +	}
 +
@@ -1531,7 +1531,7 @@
  #include "gpm-control.h"
  #include "gpm-common.h"
 +#include "gpm-cpufreq.h"
- #include "gpm-debug.h"
+ #include "egg-debug.h"
  #include "gpm-dpms.h"
  #include "gpm-idle.h"
 @@ -99,6 +100,7 @@