rpms/control-center/devel control-center-2.12.0-run-power-manager.patch, NONE, 1.1 control-center.spec, 1.93, 1.94
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 21 19:42:34 UTC 2005
Author: rstrode
Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8032
Modified Files:
control-center.spec
Added Files:
control-center-2.12.0-run-power-manager.patch
Log Message:
- run gnome-power-manager if available
control-center-2.12.0-run-power-manager.patch:
gnome-settings-daemon/Makefile.am | 2
gnome-settings-daemon/gnome-settings-daemon.c | 2
gnome-settings-daemon/gnome-settings-power-manager.c | 52 ++++++++++++
gnome-settings-daemon/gnome-settings-power-manager.h | 34 +++++++
schemas/Makefile.am | 1
schemas/apps_gnome_settings_daemon_power_manager.schemas.in | 16 +++
6 files changed, 107 insertions(+)
--- NEW FILE control-center-2.12.0-run-power-manager.patch ---
--- /dev/null 2005-09-21 13:35:05.428827750 -0400
+++ control-center-2.12.0/gnome-settings-daemon/gnome-settings-power-manager.h 2005-09-21 14:56:50.000000000 -0400
@@ -0,0 +1,34 @@
+/* -*- mode: c; style: linux -*- */
+
+/* gnome-settings-power-manager.h
+ *
+ * Copyright (C) 2005 Red Hat, Inc.
+ *
+ * Written by Matthias Clasen <mclasen at redhat.com>,
+ * Ray Strode <rstrode at redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef GNOME_SETTINGS_POWER_MANAGER_H
+#define GNOME_SETTINGS_POWER_MANAGER_H
+
+#include <gconf/gconf-client.h>
+
+void gnome_settings_power_manager_init (GConfClient *client);
+void gnome_settings_power_manager_load (GConfClient *client);
+
+#endif
--- control-center-2.12.0/gnome-settings-daemon/gnome-settings-daemon.c.run-power-manager 2005-06-12 09:09:44.000000000 -0400
+++ control-center-2.12.0/gnome-settings-daemon/gnome-settings-daemon.c 2005-09-21 14:56:50.000000000 -0400
@@ -344,6 +344,7 @@
gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
gnome_settings_keyboard_xkb_init (client);
gnome_settings_keyboard_init (client);
+ gnome_settings_power_manager_init (client);
gnome_settings_multimedia_keys_init (client);
/* */
gnome_settings_sound_init (client);
@@ -398,6 +399,7 @@
/* Essential - xkb initialization should happen before */
gnome_settings_keyboard_xkb_load (client);
gnome_settings_keyboard_load (client);
+ gnome_settings_power_manager_load (client);
gnome_settings_multimedia_keys_load (client);
/* */
gnome_settings_sound_load (client);
--- control-center-2.12.0/gnome-settings-daemon/Makefile.am.run-power-manager 2005-06-03 04:29:45.000000000 -0400
+++ control-center-2.12.0/gnome-settings-daemon/Makefile.am 2005-09-21 14:56:50.000000000 -0400
@@ -37,6 +37,8 @@
gnome-settings-accessibility-keyboard.c \
gnome-settings-screensaver.h \
gnome-settings-screensaver.c \
+ gnome-settings-power-manager.h \
+ gnome-settings-power-manager.c \
gnome-settings-default-editor.c \
gnome-settings-default-editor.h \
gnome-settings-gtk1theme.c \
--- /dev/null 2005-09-21 13:35:05.428827750 -0400
+++ control-center-2.12.0/gnome-settings-daemon/gnome-settings-power-manager.c 2005-09-21 14:56:50.000000000 -0400
@@ -0,0 +1,52 @@
+/* -*- mode: c; style: linux -*- */
+
+/* gnome-settings-power_manager.c
+ *
+ * Copyright (C) 2005 Red Hat, Inc.
+ *
+ * Written by Matthias Clasen <mclasen at redhat.com>,
+ * Ray Strode <rstrode at redhat.com>
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#include "gnome-settings-power-manager.h"
+
+#define START_POWER_MANAGER_KEY "/apps/gnome_settings_daemon/power_manager/start_power_manager"
+
+void
+gnome_settings_power_manager_init (GConfClient *client)
+{
+ /*
+ * do nothing.
+ */
+}
+
+void
+gnome_settings_power_manager_load (GConfClient *client)
+{
+ gboolean start_power_manager;
+
+ start_power_manager = gconf_client_get_bool (client, START_POWER_MANAGER_KEY, NULL);
+
+ if (!start_power_manager)
+ return;
+
+ g_spawn_command_line_async ("gnome-power-manager", NULL);
+}
+
--- /dev/null 2005-09-21 13:35:05.428827750 -0400
+++ control-center-2.12.0/schemas/apps_gnome_settings_daemon_power_manager.schemas.in 2005-09-21 14:56:50.000000000 -0400
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/apps/gnome_settings_daemon/power_manager/start_power_manager</key>
+ <applyto>/apps/gnome_settings_daemon/power_manager/start_power_manager</applyto>
+ <owner>gnome</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Start power manager</short>
+ <long>Run power manager at login</long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
--- control-center-2.12.0/schemas/Makefile.am.run-power-manager 2005-07-07 16:59:11.000000000 -0400
+++ control-center-2.12.0/schemas/Makefile.am 2005-09-21 14:56:50.000000000 -0400
@@ -1,6 +1,7 @@
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files= \
apps_gnome_settings_daemon_screensaver.schemas.in \
+ apps_gnome_settings_daemon_power_manager.schemas.in \
apps_gnome_settings_daemon_default_editor.schemas.in \
desktop_gnome_font_rendering.schemas.in \
desktop_gnome_peripherals_keyboard_xkb.schemas.in \
Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- control-center.spec 14 Sep 2005 18:39:36 -0000 1.93
+++ control-center.spec 21 Sep 2005 19:42:32 -0000 1.94
@@ -20,7 +20,7 @@
Summary: GNOME Control Center.
Name: control-center
Version: 2.12.0
-Release: 2
+Release: 3
Epoch: 1
License: GPL/LGPL
Group: User Interface/Desktops
@@ -30,6 +30,7 @@
Patch2: control-center-2.9.4-filesel.patch
Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
Patch4: control-center-2.12.0-help-left-handed-dual-mice-users.patch
+Patch5: control-center-2.12.0-run-power-manager.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.gnome.org
@@ -90,6 +91,7 @@
%patch2 -p1 -b .filesel
%patch3 -p1 -b .mark-tool-buttons-important
%patch4 -p1 -b .help-left-handed-dual-mice-users
+%patch5 -p1 -b .run-power-manager
%build
@@ -100,6 +102,10 @@
# help-left-handled-dual-mice-users patches
autoconf
+# Run aclocal and automake for run-power-manager
+aclocal
+automake
+
# Add -Wno-error to silence gswitchit
%configure --disable-gstreamer --enable-alsa CFLAGS="$RPM_OPT_FLAGS -Wno-error" --disable-about-me --disable-scrollkeeper
make
@@ -156,7 +162,7 @@
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_gnome_settings_daemon_default_editor.schemas apps_gnome_settings_daemon_keybindings.schemas apps_gnome_settings_daemon_screensaver.schemas desktop_gnome_font_rendering.schemas desktop_gnome_peripherals_keyboard_xkb.schemas fontilus.schemas themus.schemas"
+SCHEMAS="apps_gnome_settings_daemon_default_editor.schemas apps_gnome_settings_daemon_keybindings.schemas apps_gnome_settings_daemon_screensaver.schemas apps_gnome_settings_daemon_power_manager.schemas desktop_gnome_font_rendering.schemas desktop_gnome_peripherals_keyboard_xkb.schemas fontilus.schemas themus.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -200,6 +206,9 @@
# (also its headers)
%changelog
+* Wed Sep 21 2005 Ray Strode <rstrode at redhat.com> - 1:2.12.1-3
+- run gnome-power-manager if available
+
* Wed Sep 14 2005 Ray Strode <rstrode at redhat.com> - 1:2.12.1-2
- new patch for left-handed mode
More information about the fedora-cvs-commits
mailing list