Hello community, here is the log from the commit of package gnome-power-manager for openSUSE:Factory checked in at Wed Mar 25 22:34:03 CET 2009. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2009-02-16 18:20:17.000000000 +0100 +++ gnome-power-manager/gnome-power-manager.changes 2009-03-16 16:59:07.000000000 +0100 @@ -1,0 +2,41 @@ +Mon Mar 16 16:56:03 CET 2009 - vuntz@novell.com + +- Update to version 2.26.0: + + Updated translations. + +------------------------------------------------------------------- +Sun Mar 15 23:32:22 CET 2009 - vuntz@novell.com + +- Update to version 2.25.92: + + Many changes since 2.24 branch. + + The most important change is that gnome-power-manager now uses + DeviceKit-power. +- Respin gnome-power-manager-notify-idle-sleep.patch and + gnome-power-manager-reduce-deps.patch. +- Disable gnome-power-manager-schedule-wakeups.patch: needs to be + respinned, but it's a bit too complex, so I'll let the original + developer do it. +- Drop gnome-power-manager-bnc446595-shutdown-dialog.patch: fixed + upstream. +- Drop gnome-power-manager-system-policy.patch: fixed upstream + another way a long time ago. +- Drop gpm-zh_CN-translation.patch: we want to use upstream + translations. +- Drop gpm-icons.tar.bz2: those icons are not used since quite some + time, so stop installing them. +- Pass --with-doc-dir, --enable-legacy-buttons and + --enable-policykit to configure. +- Do not pass --with-dbus-services with default value to configure. +- Remove unneeded BuildRequires: docbook_4, gstreamer010-devel, + libgnomeprintui-devel, libgnomeui-devel, notification-daemon, + scrollkeeper. +- Remove unneeded Requires: PolicyKit, dbus-1, notification-daemon. +- Replace gnome-screensaver with gnome-session in Requires: + gnome-power-manager now uses gnome-session for idle. +- Add BuildRequires: DeviceKit-devel, DeviceKit-power, + gnome-keyring-devel, hal-devel, libcanberra-devel, unique-devel. +- Add Requires: DeviceKit-power. +- Remove AutoReqProv: it's default now. +- Don't package omf files twice (they are in the lang package too). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-power-manager-2.24.4.tar.bz2 gnome-power-manager-bnc446595-shutdown-dialog.patch gnome-power-manager-system-policy.patch gpm-icons.tar.bz2 gpm-zh_CN-translation.patch New: ---- gnome-power-manager-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.u11513/_old 2009-03-25 22:30:00.000000000 +0100 +++ /var/tmp/diff_new_pack.u11513/_new 2009-03-25 22:30:00.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-power-manager (Version 2.24.4) +# spec file for package gnome-power-manager (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,53 +18,48 @@ Name: gnome-power-manager +BuildRequires: DeviceKit-devel +BuildRequires: DeviceKit-power BuildRequires: PolicyKit-gnome-devel BuildRequires: docbook-utils -BuildRequires: docbook_4 BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel +BuildRequires: gnome-keyring-devel BuildRequires: gnome-panel-devel BuildRequires: gnome-patch-translation -BuildRequires: gstreamer010-devel +BuildRequires: hal-devel BuildRequires: intltool +BuildRequires: libcanberra-devel BuildRequires: libglade2-devel -BuildRequires: libgnomeprintui-devel -BuildRequires: libgnomeui-devel BuildRequires: libnotify-devel BuildRequires: libwnck-devel -BuildRequires: notification-daemon -BuildRequires: scrollkeeper BuildRequires: translation-update-upstream +BuildRequires: unique-devel BuildRequires: update-desktop-files BuildRequires: xmlto -Version: 2.24.4 -Release: 2 +Version: 2.26.0 +Release: 1 Url: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL v2 or later Summary: Power Management for GNOME Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2 -Source1: gpm-icons.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-power-manager-desktop.patch Patch: gnome-power-manager-desktop.patch -Patch2: gnome-power-manager-bnc446595-shutdown-dialog.patch -# PATCH-FIX-OPENSUSE gpm-zh_CN-translation.patch -Patch8: gpm-zh_CN-translation.patch -# PATCH-FEATURE-OPENSUSE gnome-power-manager-system-policy.patch -- acquire Policy Power interface -Patch9: gnome-power-manager-system-policy.patch -# PATCH-FEATURE-OPENSUSE gnome-power-manager-schedule-wakeups.patch gburt fate302448 -- add tab to prefs to schedule rtcwake +# PATCH-NEEDS-REBASE gnome-power-manager-schedule-wakeups.patch gburt fate302448 -- add tab to prefs to schedule rtcwake (was PATCH-FEATURE-OPENSUSE) Patch10: gnome-power-manager-schedule-wakeups.patch -# PATCH-FIX-OPENSUSE gnome-power-manager-reduce-deps.patch maw@novell.com bnc#440797 +# PATCH-FIX-OPENSUSE gnome-power-manager-reduce-deps.patch maw@novell.com bnc#440797 bgo575468 Patch11: gnome-power-manager-reduce-deps.patch -# PATCH-FEATURE-UPSTREAM gnome-power-manager-notify-idle-sleep.patch hmacht bnc#439018 -- notify user about auto suspend when returning from sleep +# PATCH-FEATURE-UPSTREAM gnome-power-manager-notify-idle-sleep.patch hmacht bnc#439018 bgo575467 -- notify user about auto suspend when returning from sleep Patch12: gnome-power-manager-notify-idle-sleep.patch # PATCH-FIX-OPENSUSE gnome-power-manager-no-fallback-to-hibernate.patch hmacht@suse.de bnc#440410 Patch14: gnome-power-manager-no-fallback-to-hibernate.patch -Requires: PolicyKit hal dbus-1 gnome-screensaver notification-daemon +Requires: DeviceKit-power +Requires: hal +Requires: gnome-session Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on %gconf_schemas_prereq %description @@ -126,17 +121,12 @@ %lang_package %prep -%setup -q -b 1 +%setup -q translation-update-upstream gnome-patch-translation-prepare %patch -%patch2 -p1 -# FIXME: patch8 doesn't apply. A Chinese speaker should determine whether we -# want to keep our translation from previous versons of gnome-power-manager or -# to use the one that now comes out of the box. -#%patch8 -%patch9 -%patch10 -p1 +# Needs rebase: +#%patch10 -p1 %patch11 -p1 %patch12 -p0 %patch14 -p1 @@ -146,21 +136,19 @@ autoreconf -f -i %configure \ --libexecdir=%{_prefix}/lib/gnome-power-manager \ + --with-doc-dir=%{_docdir}/%{name} \ --disable-schemas-install \ --disable-scrollkeeper \ - --with-dbus-services=%{_datadir}/dbus-1/services -# We'll reenable this once upstream fixes it. Still disabled by default -# upstream. -# --enable-policykit -%{__make} htmldocdir=%{_docdir}/%{name}/spec %{?jobs:-j %jobs} + --enable-legacy-buttons \ + --enable-policykit +%{__make} %{?jobs:-j %jobs} %install -%makeinstall htmldocdir=%{_docdir}/%{name}/spec +%makeinstall cp -a AUTHORS COPYING ChangeLog HACKING NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/ -cp -r ../gpm-icons/*.png $RPM_BUILD_ROOT%{_datadir}/gnome-power-manager/ %suse_update_desktop_file gnome-power-preferences System X-SuSE-ControlCenter-System +%suse_update_desktop_file gnome-power-manager %suse_update_desktop_file gnome-power-statistics -%suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst @@ -178,15 +166,12 @@ %defattr (-, root, root) %doc %{_docdir}/%{name} %{_bindir}/* +%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/applications/*.desktop -%config %{_datadir}/gnome/autostart/*.desktop %{_datadir}/gnome-power-manager -%{_datadir}/omf/gnome-power-manager %{_datadir}/icons/hicolor/*/apps/* %doc %{_mandir}/man?/*.* %config %{_datadir}/dbus-1/services/gnome-power-manager.service -# FIXME: Directory ownership. -%dir %{_datadir}/gnome/autostart %dir %{_prefix}/lib/gnome-power-manager %files -n gnome-applets-brightness @@ -204,6 +189,41 @@ %files lang -f %{name}.lang %changelog +* Mon Mar 16 2009 vuntz@novell.com +- Update to version 2.26.0: + + Updated translations. +* Sun Mar 15 2009 vuntz@novell.com +- Update to version 2.25.92: + + Many changes since 2.24 branch. + + The most important change is that gnome-power-manager now uses + DeviceKit-power. +- Respin gnome-power-manager-notify-idle-sleep.patch and + gnome-power-manager-reduce-deps.patch. +- Disable gnome-power-manager-schedule-wakeups.patch: needs to be + respinned, but it's a bit too complex, so I'll let the original + developer do it. +- Drop gnome-power-manager-bnc446595-shutdown-dialog.patch: fixed + upstream. +- Drop gnome-power-manager-system-policy.patch: fixed upstream + another way a long time ago. +- Drop gpm-zh_CN-translation.patch: we want to use upstream + translations. +- Drop gpm-icons.tar.bz2: those icons are not used since quite some + time, so stop installing them. +- Pass --with-doc-dir, --enable-legacy-buttons and + --enable-policykit to configure. +- Do not pass --with-dbus-services with default value to configure. +- Remove unneeded BuildRequires: docbook_4, gstreamer010-devel, + libgnomeprintui-devel, libgnomeui-devel, notification-daemon, + scrollkeeper. +- Remove unneeded Requires: PolicyKit, dbus-1, notification-daemon. +- Replace gnome-screensaver with gnome-session in Requires: + gnome-power-manager now uses gnome-session for idle. +- Add BuildRequires: DeviceKit-devel, DeviceKit-power, + gnome-keyring-devel, hal-devel, libcanberra-devel, unique-devel. +- Add Requires: DeviceKit-power. +- Remove AutoReqProv: it's default now. +- Don't package omf files twice (they are in the lang package too). * Mon Feb 16 2009 sbrabec@suse.cz - Added support for translation-update-upstream (FATE#301344). - Re-enabled gnome-patch-translation support. ++++++ gnome-power-manager-2.24.4.tar.bz2 -> gnome-power-manager-2.26.0.tar.bz2 ++++++ ++++ 237015 lines of diff (skipped) ++++++ gnome-power-manager-notify-idle-sleep.patch ++++++ --- /var/tmp/diff_new_pack.u11513/_old 2009-03-25 22:30:07.000000000 +0100 +++ /var/tmp/diff_new_pack.u11513/_new 2009-03-25 22:30:07.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/gpm-manager.c.orig +++ src/gpm-manager.c -@@ -719,6 +719,26 @@ gpm_manager_get_low_battery (GpmManager +@@ -637,6 +637,26 @@ gpm_manager_get_low_battery (GpmManager } /** @@ -18,7 +18,7 @@ + gboolean show_idle_sleep; + + /* only show this if specified in gconf */ -+ gpm_conf_get_bool (manager->priv->conf, GPM_CONF_NOTIFY_IDLE_SLEEP, &show_idle_sleep); ++ show_idle_sleep = gconf_client_get_bool (manager->priv->conf, GPM_CONF_NOTIFY_IDLE_SLEEP, NULL); + + /* only emit if in GConf */ + if (show_idle_sleep) @@ -29,7 +29,7 @@ * idle_do_sleep: * @manager: This class instance * -@@ -763,6 +783,11 @@ idle_do_sleep (GpmManager *manager) +@@ -679,6 +699,11 @@ idle_do_sleep (GpmManager *manager) egg_warning ("cannot suspend or hibernate: %s", error->message); g_error_free (error); } @@ -41,7 +41,7 @@ } } else if (strcmp (action, ACTION_HIBERNATE) == 0) { -@@ -778,6 +803,11 @@ idle_do_sleep (GpmManager *manager) +@@ -693,6 +718,11 @@ idle_do_sleep (GpmManager *manager) egg_warning ("cannot suspend or hibernate: %s", error->message); g_error_free (error); } @@ -57,7 +57,7 @@ =================================================================== --- src/gpm-notify.c.orig +++ src/gpm-notify.c -@@ -440,6 +440,37 @@ gpm_notify_low_capacity (GpmNotify *noti +@@ -347,6 +347,37 @@ gpm_notify_low_capacity (GpmNotify *noti } /** @@ -130,11 +130,11 @@ <key>/schemas/apps/gnome-power-manager/statistics/show_axis_labels</key> <applyto>/apps/gnome-power-manager/statistics/show_axis_labels</applyto> <owner>gnome-power-manager</owner> -Index: src/gpm-conf.h +Index: src/gpm-common.h =================================================================== ---- src/gpm-conf.h.orig -+++ src/gpm-conf.h -@@ -124,6 +124,7 @@ G_BEGIN_DECLS +--- src/gpm-common.h.orig ++++ src/gpm-common.h +@@ -127,6 +127,7 @@ G_BEGIN_DECLS #define GPM_CONF_NOTIFY_LOW_POWER GPM_CONF_DIR "/notify/low_power" #define GPM_CONF_NOTIFY_ESTIMATED_DATA GPM_CONF_DIR "/notify/estimated_data" #define GPM_CONF_NOTIFY_INHIBIT_LID GPM_CONF_DIR "/notify/inhibit_lid" ++++++ gnome-power-manager-reduce-deps.patch ++++++ --- /var/tmp/diff_new_pack.u11513/_old 2009-03-25 22:30:07.000000000 +0100 +++ /var/tmp/diff_new_pack.u11513/_new 2009-03-25 22:30:07.000000000 +0100 @@ -1,7 +1,7 @@ -diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am -index f04d597..ac5f18a 100644 ---- a/applets/brightness/Makefile.am -+++ b/applets/brightness/Makefile.am +Index: gnome-power-manager-2.25.92/applets/brightness/Makefile.am +=================================================================== +--- gnome-power-manager-2.25.92.orig/applets/brightness/Makefile.am ++++ gnome-power-manager-2.25.92/applets/brightness/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ $(HAL_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -10,9 +10,9 @@ $(LIBNOTIFY_CFLAGS) \ $(GTKUNIQUE_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ -@@ -28,7 +29,8 @@ gnome_brightness_applet_SOURCES = brightness-applet.c +@@ -34,7 +35,8 @@ gnome_brightness_applet_SOURCES = \ + gnome_brightness_applet_LDADD = \ - $(LOCAL_LIBDBUS_LIBS) \ $(DBUS_LIBS) \ - $(GNOME_LIBS) + $(GNOME_LIBS) \ @@ -20,10 +20,10 @@ serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_BrightnessApplet.server.in -diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am -index fe1b69b..fe07edb 100644 ---- a/applets/inhibit/Makefile.am -+++ b/applets/inhibit/Makefile.am +Index: gnome-power-manager-2.25.92/applets/inhibit/Makefile.am +=================================================================== +--- gnome-power-manager-2.25.92.orig/applets/inhibit/Makefile.am ++++ gnome-power-manager-2.25.92/applets/inhibit/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ $(HAL_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -32,9 +32,9 @@ $(LIBNOTIFY_CFLAGS) \ $(GTKUNIQUE_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ -@@ -28,7 +29,8 @@ gnome_inhibit_applet_SOURCES = inhibit-applet.c +@@ -34,7 +35,8 @@ gnome_inhibit_applet_SOURCES = \ + gnome_inhibit_applet_LDADD = \ - $(LOCAL_LIBDBUS_LIBS) \ $(DBUS_LIBS) \ - $(GNOME_LIBS) + $(GNOME_LIBS) \ @@ -42,13 +42,23 @@ serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_InhibitApplet.server.in -diff --git a/configure.ac b/configure.ac -index 5b15af4..8e80973 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,11 +116,16 @@ PKG_CHECK_MODULES(GNOME, [ +Index: gnome-power-manager-2.25.92/configure.ac +=================================================================== +--- gnome-power-manager-2.25.92.orig/configure.ac ++++ gnome-power-manager-2.25.92/configure.ac +@@ -89,6 +89,7 @@ dnl ------------------------------------ + GLIB_REQUIRED=2.13.0 + GTK_REQUIRED=2.11.0 + GDK_REQUIRED=2.11.0 ++GCONF_REQUIRED=2.10.0 + GNOME_KEYRING_REQUIRED=0.6.0 + HAL_REQUIRED=0.5.8 + DBUS_REQUIRED=0.70 +@@ -146,12 +147,18 @@ PKG_CHECK_MODULES(GNOME, [ + libglade-2.0 >= $LIBGLADE_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED ++ gconf-2.0 >= $GCONF_REQUIRED gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED - libpanelapplet-2.0 >= $LIBPANEL_REQUIRED cairo >= $CAIRO_REQUIRED]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org