2008-06-03 simon.zheng <
[email protected]>
* base-specs/gnome-power-manager.spec: Bumped to 2.23.1
* patches/gnome-power-manager-01-build.diff: Reworked.
* patches/gnome-power-manager-04-scripts.diff: Upstream, removed.
* patches/gnome-power-manager-07-screensaver.diff: Reworked.
--- a/ChangeLog Tue Jun 03 04:24:47 2008 +0000
+++ b/ChangeLog Tue Jun 03 06:35:32 2008 +0000
@@ -1,3 +1,10 @@
+2008-06-03 simon.zheng <[email protected]>
+
+ * base-specs/gnome-power-manager.spec: Bumped to 2.23.1
+ * patches/gnome-power-manager-01-build.diff: Reworked.
+ * patches/gnome-power-manager-04-scripts.diff: Upstream, removed.
+ * patches/gnome-power-manager-07-screensaver.diff: Reworked.
+
2008-06-03 Wang Xin <[email protected]>
* base-specs/evolution.spec: Enable 07-lost-tab.diff.
--- a/base-specs/gnome-power-manager.spec Tue Jun 03 04:24:47 2008 +0000
+++ b/base-specs/gnome-power-manager.spec Tue Jun 03 06:35:32 2008 +0000
@@ -11,12 +11,12 @@
Name: gnome-power-manager
License: GPL
Group: X11/Applications
-Version: 2.22.1
+Version: 2.23.1
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.22/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.23/%{name}-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -26,8 +26,6 @@
Patch2: gnome-power-manager-02-icon_plicy_and_cpufreq_show.diff
# date:2008-02-14 owner:xz159989 type:feature
Patch3: gnome-power-manager-03-disable-sleep-configration.diff
-# date:2008-02-14 bugzilla:526349 owner:xz159989 type:bug
-Patch4: gnome-power-manager-04-scripts.diff
# date:2008-02-14 owner:xz159989 type:feature
Patch5: gnome-power-manager-05-diable-suspend-button-configration.diff
# date:2008-02-14 bugzilla:507391 owner:xz159989 type:bug
@@ -95,13 +93,12 @@
%setup -q
%patch1 -p1
%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
+#%patch3 -p0
+#%patch5 -p0
%patch6 -p0
%patch7 -p0
-%patch8 -p0
-%patch9 -p0
+#%patch8 -p0
+#%patch9 -p0
%patch10 -p0
%build
@@ -118,13 +115,15 @@
export CFLAGS="%optflags"
export LDFLAGS="%_ldflags"
-intltoolize --copy --force --automake
+intltoolize --force
+aclocal $ACLOCAL_FLAGS -I .
%if %build_l10n
bash -x %SOURCE1 --enable-copyright
%endif
autoheader
+automake -a -c -f
autoconf
./configure --prefix=%{_prefix} \
--enable-policykit \
@@ -167,6 +166,11 @@
%changelog
+* Tue Jun 03 2008 - [email protected]
+- Bump to 2.23.1.
+- Removed upstream patch 04-scripts.diff.
+- Rework 07-screensaver.diff.
+- Disable some patches for the time being. Need further work.
* Fri May 23 2008 - [email protected]
- disable gconf schema install during make install to get rid of tons
of warning. Also delete extra \ at the end of the make install line
--- a/patches/gnome-power-manager-01-build.diff Tue Jun 03 04:24:47 2008 +0000
+++ b/patches/gnome-power-manager-01-build.diff Tue Jun 03 06:35:32 2008 +0000
@@ -1,12 +1,3 @@
-diff -Nur gnome-power-manager-2.21.1-org/help/Makefile.am gnome-power-manager-2.21.1/help/Makefile.am
---- gnome-power-manager-2.21.1-org/help/Makefile.am 2007-12-17 17:12:56.218240000 +0800
-+++ gnome-power-manager-2.21.1/help/Makefile.am 2007-12-17 17:08:33.198369000 +0800
-@@ -19,4 +19,4 @@
- figures/gpm-unplugged.png \
- figures/gs-prefs.png
-
--DOC_LINGUAS = ca es fr hu it oc pa ru sv
-+DOC_LINGUAS = ca es fr it oc pa ru sv
diff -Nur gnome-power-manager-2.21.1-org/src/gpm-array-float.c gnome-power-manager-2.21.1/src/gpm-array-float.c
--- gnome-power-manager-2.21.1-org/src/gpm-array-float.c 2007-12-17 17:12:56.275650000 +0800
+++ gnome-power-manager-2.21.1/src/gpm-array-float.c 2007-12-17 17:02:07.642824000 +0800
@@ -75,3 +66,14 @@
dnl - Where should we put documentation ?
dnl ---------------------------------------------------------------------------
AC_ARG_WITH(doc-dir,
+--- gnome-power-manager-2.23.1/configure.ac.orig 2008-06-03 13:05:01.317488000 +0800
++++ gnome-power-manager-2.23.1/configure.ac 2008-06-03 13:05:20.427246000 +0800
+@@ -220,7 +220,7 @@
+ dnl - Build gconf default button?
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_ENABLE(gconfdefaults, [ --gconf-defaults Allow setting gconf default settings],
+- enable_gconfdefaults=$enableval,enable_gconfdefaults=yes)
++ enable_gconfdefaults=$enableval,enable_gconfdefaults=no)
+ AC_MSG_CHECKING([whether to support gconf defaults])
+ have_gconfdefaults=no
+ if test x$enable_gconfdefaults = xyes ; then
--- a/patches/gnome-power-manager-04-scripts.diff Tue Jun 03 04:24:47 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
---- tools/gnome-power-bugreport.sh.org 2007-12-18 13:55:22.379051000 +0800
-+++ tools/gnome-power-bugreport.sh 2007-12-18 13:55:31.036043000 +0800
-@@ -36,7 +36,7 @@
- }
-
- echo -n "Distro version: "
--cat /etc/*-release | uniq
-+cat /etc/release | uniq
-
- echo -n "Kernel version: "
- uname -r
-@@ -70,8 +70,8 @@
- lshal | grep "battery\."
-
- echo "GNOME Power Manager Process Information:"
--ps aux --forest | grep gnome-power | grep -v grep
-+ptree -a `pgrep power` | grep -v grep
-
- echo "HAL Process Information:"
--ps aux --forest | grep hald | grep -v grep
-+ptree -a `pgrep hald `| grep -v grep
-
---- data/gnome-power-manager.desktop.in.in.orig 2008-03-01 13:31:22.811069000 -0800
-+++ data/gnome-power-manager.desktop.in.in 2008-03-01 13:31:41.427967000 -0800
-@@ -12,4 +12,4 @@
- X-GNOME-Bugzilla-Product=gnome-power-manager
- X-GNOME-Bugzilla-Component=gnome-power-manager
- X-GNOME-Bugzilla-Version=@VERSION@
--X-GNOME-Bugzilla-ExtraInfoScript=gnome-power-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/lib/gnome-power-bugreport.sh
--- a/patches/gnome-power-manager-07-screensaver.diff Tue Jun 03 04:24:47 2008 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff Tue Jun 03 06:35:32 2008 +0000
@@ -1,31 +1,3 @@
---- data/gpm-prefs.glade.orig 2008-02-04 10:15:41.232379000 +0800
-+++ data/gpm-prefs.glade 2008-02-04 16:22:55.133775000 +0800
-@@ -1784,6 +1784,25 @@
- </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>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="active">False</property>
-+ <property name="inconsistent">False</property>
-+ <property name="draw_indicator">True</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
- <widget class="GtkCheckButton" id="checkbutton_general_ambient">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
--- data/gnome-power-manager.schemas.in.orig 2008-02-04 10:12:40.941327000 +0800
+++ data/gnome-power-manager.schemas.in 2008-02-04 10:24:07.361341000 +0800
@@ -929,6 +929,18 @@
@@ -162,19 +134,26 @@
return TRUE;
}
---- src/gpm-manager.c.orig 2008-03-22 00:30:47.830993000 +0800
-+++ src/gpm-manager.c 2008-03-22 01:52:19.061395000 +0800
-@@ -1754,11 +1754,13 @@
- /* try and start an interactive service */
- manager->priv->cpufreq = gpm_cpufreq_new ();
-
-+#ifndef SOLARIS
- /* try and start an interactive service */
- manager->priv->screensaver = gpm_screensaver_new ();
- g_signal_connect (manager->priv->screensaver, "auth-request",
- G_CALLBACK (screensaver_auth_request_cb), manager);
- manager->priv->srv_screensaver = gpm_srv_screensaver_new ();
-+#endif
-
- /* try an start an interactive service */
- manager->priv->backlight = gpm_backlight_new ();
+--- 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 @@
+ <property name="position">3</property>
+ </packing>
+ </child>
++ <child>
++ <widget class="GtkCheckButton" id="checkbutton_screen_lock">
++ <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>
++ <property name="response_id">0</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">4</property>
++ </packing>
++ </child>
+ </widget>
+ </child>
+ </widget>