rpms/gnome-power-manager/devel gnome-power-manager-2.27.2-fix-potfiles.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 gnome-power-manager-port-to-polkit1.patch, 1.1, 1.2 gnome-power-manager.spec, 1.162, 1.163 sources, 1.60, 1.61
Richard Hughes
rhughes at fedoraproject.org
Mon Jul 6 14:50:35 UTC 2009
Author: rhughes
Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32481
Modified Files:
.cvsignore gnome-power-manager-port-to-polkit1.patch
gnome-power-manager.spec sources
Added Files:
gnome-power-manager-2.27.2-fix-potfiles.patch
Log Message:
* Mon Jul 06 2009 Richard Hughes <rhughes at redhat.com> - 2.27.2-1
- Update to 2.27.1
gnome-power-manager-2.27.2-fix-potfiles.patch:
--- NEW FILE gnome-power-manager-2.27.2-fix-potfiles.patch ---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f5359c7..5760324 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,6 @@ data/gnome-power-statistics.desktop.in.in
[type: gettext/glade]data/gpm-statistics.ui
[type: gettext/glade]data/gpm-prefs.ui
src/gpm-backlight.c
-src/gpm-brightness-kbd.c
src/gpm-brightness-hal.c
src/gpm-brightness-xrandr.c
src/gpm-button.c
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore 16 Jun 2009 08:21:33 -0000 1.60
+++ .cvsignore 6 Jul 2009 14:50:35 -0000 1.61
@@ -1 +1 @@
-gnome-power-manager-2.27.2-20090616.tar.gz
+gnome-power-manager-2.27.2.tar.gz
gnome-power-manager-port-to-polkit1.patch:
Index: gnome-power-manager-port-to-polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager-port-to-polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnome-power-manager-port-to-polkit1.patch 16 Jun 2009 12:34:29 -0000 1.1
+++ gnome-power-manager-port-to-polkit1.patch 6 Jul 2009 14:50:35 -0000 1.2
@@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
-index 0c0911c..0ff2c05 100644
+index 0e366fb..c723401 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -99,7 +99,6 @@ CAIRO_REQUIRED=1.0.0
+@@ -102,7 +102,6 @@ CAIRO_REQUIRED=1.0.0
UNIQUE_REQUIRED=0.9.4
LIBPANEL_REQUIRED=2.0.0
XRANDR_REQUIRED=1.2.0
@@ -10,7 +10,7 @@ index 0c0911c..0ff2c05 100644
CANBERRA_REQUIRED=0.10
DEVKIT_REQUIRED=001
DEVKIT_POWER_REQUIRED=008
-@@ -118,7 +117,6 @@ AC_SUBST(CAIRO_REQUIRED)
+@@ -121,7 +120,6 @@ AC_SUBST(CAIRO_REQUIRED)
AC_SUBST(UNIQUE_REQUIRED)
AC_SUBST(LIBPANEL_REQUIRED)
AC_SUBST(XRANDR_REQUIRED)
@@ -18,7 +18,7 @@ index 0c0911c..0ff2c05 100644
dnl ---------------------------------------------------------------------------
dnl - Check library dependencies
-@@ -223,29 +221,6 @@ fi
+@@ -226,29 +224,6 @@ fi
AC_SUBST(DOCDIR)
dnl ---------------------------------------------------------------------------
@@ -48,7 +48,7 @@ index 0c0911c..0ff2c05 100644
dnl - Require DeviceKit-power support
dnl ---------------------------------------------------------------------------
AC_PATH_PROG(DEVKIT_POWER, devkit-power)
-@@ -311,17 +286,11 @@ dnl ---------------------------------------------------------------------------
+@@ -296,17 +271,11 @@ dnl ---------------------------------------------------------------------------
AC_ARG_ENABLE(gconf-defaults,
AS_HELP_STRING([--disable-gconf-defaults],
[Allow setting gconf default settings]),
@@ -69,19 +69,19 @@ index 0c0911c..0ff2c05 100644
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
-@@ -673,7 +642,6 @@ echo "
+@@ -658,7 +627,6 @@ echo "
cflags: ${CFLAGS}
Building extra applets: ${enable_applets}
DPMS support: ${have_dpms}
- PolicyKit support: ${have_polkit}
- Legacy buttons support: ${have_legacy_buttons}
Self test support: ${have_tests}
GConf default support: ${have_gconfdefaults}
+ Docbook support: ${enable_docbook_docs}
diff --git a/data/gpm-prefs.ui b/data/gpm-prefs.ui
-index d9cc83e..f381f85 100644
+index 35ddd01..4726849 100644
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
-@@ -1180,6 +1180,19 @@
+@@ -1097,6 +1097,19 @@
</packing>
</child>
<child>
@@ -101,7 +101,7 @@ index d9cc83e..f381f85 100644
<object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
-@@ -1192,7 +1205,7 @@
+@@ -1109,7 +1122,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -110,7 +110,7 @@ index d9cc83e..f381f85 100644
</packing>
</child>
</object>
-@@ -1206,6 +1219,7 @@
+@@ -1123,6 +1136,7 @@
</child>
<action-widgets>
<action-widget response="0">button_help</action-widget>
@@ -118,8 +118,45 @@ index d9cc83e..f381f85 100644
<action-widget response="0">button_close</action-widget>
</action-widgets>
</object>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 559e0ee..18e80ab 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,8 +21,6 @@ INCLUDES = \
+ $(GSTREAMER_CFLAGS) \
+ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
+ $(DEVKIT_CFLAGS) \
+- $(POLKIT_CFLAGS) \
+- $(POLKIT_GNOME_CFLAGS) \
+ -DBINDIR=\"$(bindir)\" \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DDATADIR=\"$(datadir)\" \
+@@ -125,7 +123,6 @@ gnome_power_preferences_LDADD = \
+ $(HAL_LIBS) \
+ $(DBUS_LIBS) \
+ $(UNIQUE_LIBS) \
+- $(POLKIT_GNOME_LIBS) \
+ $(GPM_EXTRA_LIBS) \
+ $(LOCAL_LIBHAL_LIBS) \
+ $(DEVKIT_LIBS) \
+@@ -208,7 +205,6 @@ gnome_power_manager_LDADD = \
+ $(GSTREAMER_LIBS) \
+ $(GNOME_LIBS) \
+ $(HAL_LIBS) \
+- $(POLKIT_LIBS) \
+ $(DBUS_LIBS) \
+ $(XRANDR_LIBS) \
+ $(CANBERRA_LIBS) \
+@@ -280,7 +276,6 @@ gnome_power_self_test_LDADD = \
+ $(GLIB_LIBS) \
+ $(GNOME_LIBS) \
+ $(GSTREAMER_LIBS) \
+- $(POLKIT_GNOME_LIBS) \
+ $(DEVKIT_LIBS) \
+ $(DBUS_LIBS) \
+ $(LIBNOTIFY_LIBS) \
diff --git a/src/gpm-control.c b/src/gpm-control.c
-index 043b667..21eb85a 100644
+index 37128d4..4148dcf 100644
--- a/src/gpm-control.c
+++ b/src/gpm-control.c
@@ -43,11 +43,6 @@
@@ -164,7 +201,7 @@ index 043b667..21eb85a 100644
* gpm_control_check_foreground_console:
* @manager: This class instance
* @action: The action we want to do, e.g. "suspend"
-@@ -158,19 +130,17 @@ gboolean
+@@ -158,7 +130,6 @@ gboolean
gpm_control_allowed_suspend (GpmControl *control, gboolean *can, GError **error)
{
gboolean conf_ok;
@@ -172,11 +209,14 @@ index 043b667..21eb85a 100644
gboolean hardware_ok;
gboolean fg;
g_return_val_if_fail (can, FALSE);
+@@ -171,11 +142,13 @@ gpm_control_allowed_suspend (GpmControl *control, gboolean *can, GError **error)
+ NULL);
- *can = FALSE;
conf_ok = gconf_client_get_bool (control->priv->conf, GPM_CONF_CAN_SUSPEND, NULL);
- polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.devicekit.power.suspend");
- hardware_ok = dkp_client_can_suspend (control->priv->client);
++ g_object_get (control->priv->client,
++ "can-suspend", &hardware_ok,
++ NULL);
fg = gpm_control_check_foreground_console (control);
- if (conf_ok && hardware_ok && polkit_ok && fg)
+ if (conf_ok && hardware_ok && fg)
@@ -186,7 +226,7 @@ index 043b667..21eb85a 100644
return TRUE;
}
-@@ -186,7 +156,6 @@ gboolean
+@@ -191,7 +164,6 @@ gboolean
gpm_control_allowed_hibernate (GpmControl *control, gboolean *can, GError **error)
{
gboolean conf_ok;
@@ -194,13 +234,15 @@ index 043b667..21eb85a 100644
gboolean hardware_ok;
gboolean fg;
g_return_val_if_fail (can, FALSE);
-@@ -194,11 +163,10 @@ gpm_control_allowed_hibernate (GpmControl *control, gboolean *can, GError **erro
+@@ -204,10 +176,12 @@ gpm_control_allowed_hibernate (GpmControl *control, gboolean *can, GError **erro
*can = FALSE;
conf_ok = gconf_client_get_bool (control->priv->conf, GPM_CONF_CAN_HIBERNATE, NULL);
fg = gpm_control_check_foreground_console (control);
- polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.devicekit.power.hibernate");
- hardware_ok = dkp_client_can_hibernate (control->priv->client);
- if (conf_ok && hardware_ok && polkit_ok && fg)
++ g_object_get (control->priv->client,
++ "can-hibernate", &hardware_ok,
++ NULL);
+ if (conf_ok && hardware_ok && fg)
*can = TRUE;
- egg_debug ("conf=%i, polkit=%i, fg=%i, can=%i", conf_ok, polkit_ok, fg, *can);
@@ -209,10 +251,10 @@ index 043b667..21eb85a 100644
}
diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
-index ccf6375..ba09df0 100644
+index 9155a74..c1f1171 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
-@@ -43,10 +43,6 @@
+@@ -41,10 +41,6 @@
#include "gpm-stock-icons.h"
#include "gpm-prefs-server.h"
@@ -223,7 +265,7 @@ index ccf6375..ba09df0 100644
static void gpm_prefs_finalize (GObject *object);
#define GPM_PREFS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_PREFS, GpmPrefsPrivate))
-@@ -66,9 +62,6 @@ struct GpmPrefsPrivate
+@@ -63,9 +59,6 @@ struct GpmPrefsPrivate
gboolean can_hibernate;
guint idle_delay;
GConfClient *conf;
@@ -233,7 +275,7 @@ index ccf6375..ba09df0 100644
};
enum {
-@@ -186,8 +179,7 @@ out:
+@@ -183,8 +176,7 @@ out:
* @prefs: This prefs class instance
**/
static void
@@ -243,7 +285,7 @@ index ccf6375..ba09df0 100644
{
egg_debug ("emitting action-help");
g_signal_emit (prefs, signals [ACTION_HELP], 0);
-@@ -198,8 +190,7 @@ gpm_prefs_help_cb (GtkWidget *widget,
+@@ -195,8 +187,7 @@ gpm_prefs_help_cb (GtkWidget *widget,
* @widget: The GtkWidget object
**/
static void
@@ -253,7 +295,7 @@ index ccf6375..ba09df0 100644
{
const gchar *str;
gint policy;
-@@ -216,8 +207,7 @@ gpm_prefs_icon_radio_cb (GtkWidget *widget,
+@@ -213,8 +204,7 @@ gpm_prefs_icon_radio_cb (GtkWidget *widget,
* @value: The value in %.
**/
static gchar *
@@ -263,7 +305,7 @@ index ccf6375..ba09df0 100644
{
return g_strdup_printf ("%.0f%%", value);
}
-@@ -229,9 +219,7 @@ gpm_prefs_format_percentage_cb (GtkScale *scale,
+@@ -226,9 +216,7 @@ gpm_prefs_format_percentage_cb (GtkScale *scale,
* @prefs: This prefs class instance
**/
static gchar *
@@ -274,7 +316,7 @@ index ccf6375..ba09df0 100644
{
gchar *str;
if ((gint) value == NEVER_TIME_ON_SLIDER) {
-@@ -248,8 +236,7 @@ gpm_prefs_format_time_cb (GtkScale *scale,
+@@ -245,8 +233,7 @@ gpm_prefs_format_time_cb (GtkScale *scale,
* @gpm_pref_key: The GConf key for this preference setting.
**/
static void
@@ -284,7 +326,7 @@ index ccf6375..ba09df0 100644
{
int value;
char *gpm_pref_key;
-@@ -919,12 +906,11 @@ prefs_setup_general (GpmPrefs *prefs)
+@@ -901,12 +888,11 @@ prefs_setup_general (GpmPrefs *prefs)
}
}
@@ -299,7 +341,7 @@ index ccf6375..ba09df0 100644
{
GConfClient *client;
DBusGProxy *proxy;
-@@ -966,27 +952,6 @@ pk_prefs_set_defaults_cb (PolKitGnomeAction *default_action, GpmPrefs *prefs)
+@@ -948,27 +934,6 @@ pk_prefs_set_defaults_cb (PolKitGnomeAction *default_action, GpmPrefs *prefs)
}
/**
@@ -327,7 +369,7 @@ index ccf6375..ba09df0 100644
* gpm_prefs_init:
* @prefs: This prefs class instance
**/
-@@ -995,9 +960,6 @@ gpm_prefs_init (GpmPrefs *prefs)
+@@ -977,9 +942,6 @@ gpm_prefs_init (GpmPrefs *prefs)
{
GtkWidget *main_window;
GtkWidget *widget;
@@ -337,7 +379,7 @@ index ccf6375..ba09df0 100644
gint caps;
guint retval;
GError *error = NULL;
-@@ -1037,18 +999,6 @@ gpm_prefs_init (GpmPrefs *prefs)
+@@ -1022,18 +984,6 @@ gpm_prefs_init (GpmPrefs *prefs)
main_window = GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, "dialog_preferences"));
@@ -356,7 +398,7 @@ index ccf6375..ba09df0 100644
/* Hide window first so that the dialogue resizes itself without redrawing */
gtk_widget_hide (main_window);
gtk_window_set_default_icon_name (GPM_STOCK_APP_ICON);
-@@ -1065,9 +1015,12 @@ gpm_prefs_init (GpmPrefs *prefs)
+@@ -1050,9 +1000,12 @@ gpm_prefs_init (GpmPrefs *prefs)
g_signal_connect (widget, "clicked",
G_CALLBACK (gpm_prefs_help_cb), prefs);
Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- gnome-power-manager.spec 16 Jun 2009 12:34:29 -0000 1.162
+++ gnome-power-manager.spec 6 Jul 2009 14:50:35 -0000 1.163
@@ -5,18 +5,21 @@
Summary: GNOME Power Manager
Name: gnome-power-manager
Version: 2.27.2
-#Release: 1%{?dist}
-Release: 0.2.%{?alphatag}git%{?dist}
+Release: 1%{?dist}
+#Release: 0.2.%{?alphatag}git%{?dist}
License: GPLv2+ and GFDL
Group: Applications/System
-#Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
-Source: http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
+#Source: http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://projects.gnome.org/gnome-power-manager/
# from upstream polkit1 branch, automatically generated
Patch0: gnome-power-manager-port-to-polkit1.patch
+# trivial, already upstream
+Patch1: gnome-power-manager-2.27.2-fix-potfiles.patch
+
BuildRequires: libwnck-devel
BuildRequires: hal-devel >= %{hal_version}
BuildRequires: dbus-devel >= %{dbus_version}
@@ -55,9 +58,10 @@ GNOME Power Preferences allows authorise
change preferences.
%prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
%patch0 -p1 -b .polkit1
+%patch1 -p1 -b .potfiles
# we messed about with configure.ac and Makefile.am, so regenerate (due to polkit1 patch)
autoreconf
@@ -163,6 +167,9 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_*.xml
%changelog
+* Mon Jul 06 2009 Richard Hughes <rhughes at redhat.com> - 2.27.2-1
+- Update to 2.27.1
+
* Tue Jun 16 2009 Richard Hughes <rhughes at redhat.com> - 2.27.2-0.2.20090616git
- Apply a patch to convert to the PolKit1 API.
- Do autoreconf as the polkit patch is pretty invasive
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources 16 Jun 2009 08:21:33 -0000 1.60
+++ sources 6 Jul 2009 14:50:35 -0000 1.61
@@ -1 +1 @@
-f075bc270cd5c8203b7ff90dace84ca6 gnome-power-manager-2.27.2-20090616.tar.gz
+9245008c9dd1480e925156d84ef4f275 gnome-power-manager-2.27.2.tar.gz
More information about the fedora-extras-commits
mailing list