--- a/ChangeLog	Fri Sep 19 03:12:29 2008 +0000
+++ b/ChangeLog	Fri Sep 19 03:21:36 2008 +0000
@@ -1,3 +1,12 @@
+2008-09-19  simon.zheng  <[email protected]>
+
+	* SUNWgnome-power-manager.spec:
+	* base-specs/gnome-power-manager.spec:
+	* patches/gnome-power-manager-07-screensaver.diff:
+	  Rework to fix bugster #6750004.
+	* patches/gnome-power-manager-10-brightness-progressbar.diff:
+	  Add to fix bugzilla #552762.
+
 2008-09-19  Rick Ju <[email protected]>
 
 	* SUNWw3m.spec, SUNWlibgsf.spec:

--- a/SUNWgnome-power-manager.spec	Fri Sep 19 03:12:29 2008 +0000
+++ b/SUNWgnome-power-manager.spec	Fri Sep 19 03:21:36 2008 +0000
@@ -128,6 +128,7 @@
 %files
 %doc -d gnome-power-manager-%{gpm.version} README AUTHORS
 %doc(bzip2) -d gnome-power-manager-%{gpm.version} COPYING NEWS ChangeLog po/ChangeLog help/ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %defattr (-, root, bin)
 %{_bindir}/*
 %{_libdir}/gnome-*-applet
@@ -140,7 +141,6 @@
 %{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
 %{_datadir}/gnome-power-manager/*
 %if %with_xmlto
-%dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/gnome-power-manager-*/*
 %endif
 %{_datadir}/dbus-1/services/gnome-power-manager.service

--- a/base-specs/gnome-power-manager.spec	Fri Sep 19 03:12:29 2008 +0000
+++ b/base-specs/gnome-power-manager.spec	Fri Sep 19 03:21:36 2008 +0000
@@ -34,10 +34,12 @@
 Patch6:        gnome-power-manager-06-interactive-dialog.diff
 # date:2008-02-14 owner:xz159989 type:feature
 Patch7:        gnome-power-manager-07-screensaver.diff
-# date:2008-03-14 owner:xz159989 type:feature
+# date:2008-09-19 bugster:6750001 owner:xz159989 type:feature
 Patch8:        gnome-power-manager-08-cpufreq.diff
 # date:2008-09-11 owner:jedy type:branding
 Patch9:        gnome-power-manager-09-menu-entry.diff
+# date:2008-09-19 bugzilla:552762 owner:xz159989 type:branding
+Patch10:       gnome-power-manager-10-brightness-progressbar.diff
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.73
@@ -99,6 +101,7 @@
 %patch7 -p0
 %patch8 -p0
 %patch9 -p1
+%patch10 -p0
 
 %build
 %ifos linux
@@ -165,6 +168,9 @@
 
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Rework 07-screensaver.diff to fix bugster #6750004.
+- Add 10-brightness-progressbar.diff to fix bugzilla #552762.
 * Tue Sep 16 2008 - [email protected]
 - Rework 08-cpufreq.diff to configure cpufreq policy.
 * Thu Sep 11 2008 - [email protected]

--- a/patches/gnome-power-manager-07-screensaver.diff	Fri Sep 19 03:12:29 2008 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff	Fri Sep 19 03:21:36 2008 +0000
@@ -121,14 +121,28 @@
  
  	return TRUE;
  }
---- data/gpm-prefs.glade.orig	2008-06-02 23:14:08.822762000 +0800
-+++ data/gpm-prefs.glade	2008-06-02 23:24:55.877203000 +0800
-@@ -1041,6 +1041,20 @@
+--- src/gpm-prefs-core.c.orig	2008-08-07 13:42:30.764652576 +0800
++++ src/gpm-prefs-core.c	2008-08-07 13:48:01.063915852 +0800
+@@ -770,6 +770,10 @@
+ 	/* set up the sound checkbox */
+ 	gpm_prefs_setup_checkbox (prefs, "checkbutton_notification_sound",
+ 	  			  GPM_CONF_UI_ENABLE_BEEPING);
++	
++	/* set up the screen locking checkbox */
++	gpm_prefs_setup_checkbox (prefs, "checkbutton_screen_lock",
++                                 GPM_CONF_UI_ENABLE_SCREEN_LOCK);
+ 
+ 	if (prefs->priv->has_batteries) {
+ 		/* there's no use case for displaying this option */
+--- data/gpm-prefs.glade.orig	2008-09-19 10:41:33.055069000 +0800
++++ data/gpm-prefs.glade	2008-09-19 10:41:49.819455000 +0800
+@@ -1145,6 +1145,21 @@
                                  <property name="position">3</property>
                                </packing>
                              </child>
 +                            <child>
 +                              <widget class="GtkCheckButton" id="checkbutton_screen_lock">
++                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
 +                                <property name="label" translatable="yes">_Lock screen when computer is restored from blank screen, suspend or hibernate</property>
 +                                <property name="use_underline">True</property>
@@ -144,16 +158,3 @@
                            </widget>
                          </child>
                        </widget>
---- src/gpm-prefs-core.c.orig	2008-08-07 13:42:30.764652576 +0800
-+++ src/gpm-prefs-core.c	2008-08-07 13:48:01.063915852 +0800
-@@ -770,6 +770,10 @@
- 	/* set up the sound checkbox */
- 	gpm_prefs_setup_checkbox (prefs, "checkbutton_notification_sound",
- 	  			  GPM_CONF_UI_ENABLE_BEEPING);
-+	
-+	/* set up the screen locking checkbox */
-+	gpm_prefs_setup_checkbox (prefs, "checkbutton_screen_lock",
-+                                 GPM_CONF_UI_ENABLE_SCREEN_LOCK);
- 
- 	if (prefs->priv->has_batteries) {
- 		/* there's no use case for displaying this option */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-power-manager-10-brightness-progressbar.diff	Fri Sep 19 03:21:36 2008 +0000
@@ -0,0 +1,20 @@
+--- src/gpm-brightness-hal.c.orig	2008-09-18 18:12:03.059080000 +0800
++++ src/gpm-brightness-hal.c	2008-09-18 19:00:34.793625000 +0800
+@@ -305,7 +305,7 @@
+ gboolean
+ gpm_brightness_hal_up (GpmBrightnessHal *brightness, gboolean *hw_changed)
+ {
+-	gboolean ret = FALSE;
++	gboolean ret = TRUE;
+ 	gint step;
+ 	guint current_hw;
+ 
+@@ -348,7 +348,7 @@
+ gboolean
+ gpm_brightness_hal_down (GpmBrightnessHal *brightness, gboolean *hw_changed)
+ {
+-	gboolean ret = FALSE;
++	gboolean ret = TRUE;
+ 	gint step;
+ 	guint current_hw;
+