Hello community, here is the log from the commit of package upower for openSUSE:Factory checked in at 2012-09-13 07:09:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/upower (Old) and /work/SRC/openSUSE:Factory/.upower.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "upower", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/upower/upower.changes 2012-05-16 21:35:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.upower.new/upower.changes 2012-09-13 07:09:56.000000000 +0200 @@ -1,0 +2,38 @@ +Tue Sep 11 16:09:12 UTC 2012 - [email protected] + +- Update to version 0.9.18: + + New Features: + - Use systemd if possible for suspend and hibernate + + Bugfixes: + - openbsd: Properly initialize update-time when creating + devices +- Changes from version 0.9.17: + + New Features: + - Fail on CRITICALs in the integration-test + + Bugfixes: + - Drop 'type' parameter from CancelRequest() signature + - Fix the LatencyChanged signal + - Fix use-after-free of qos item + - Fix wrong PowerSupply property for devices without a scope + sysfs attribute + - linux: + + Don't allow non-power-supply devices to set the OnBattery + property + + Remove obsolete check for magicmouse_ and duplicated wacom_ + checks + + Treat the battery state 'not charging' as PENDING_CHARGE + - Selectively disable warnings for deprecated GValueArray +- Drop xz BuildRequires as it now comes for free in the build + system. +- Get ready for full-switch to systemd for suspend and hibernate: + + Add a with_systemd macro, currently set to 0 as we would need + systemd >= 183, which we don't have right now. + + Add pkgconfig(libsystemd-daemon) BuildRequires if we build + systemd support. + + Pass --enable-systemd to configure if we build systemd support. + + Do not install /lib/systemd/system-sleep/notify-upower.sh if we + don't build with systemd support. +- Add upower-fix-resume-no-systemd.patch: fix resuming when not + booted with systemd. + +------------------------------------------------------------------- Old: ---- upower-0.9.16.tar.xz New: ---- upower-0.9.18.tar.xz upower-fix-resume-no-systemd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upower.spec ++++++ --- /var/tmp/diff_new_pack.tVWIRl/_old 2012-09-13 07:09:58.000000000 +0200 +++ /var/tmp/diff_new_pack.tVWIRl/_new 2012-09-13 07:09:58.000000000 +0200 @@ -16,14 +16,20 @@ # +# We cannot enable systemd support right now, as the sleep support is in >= 183 +%define with_systemd 0 + Name: upower Summary: Power Device Enumeration Framework License: GPL-2.0+ Group: System/Daemons -Version: 0.9.16 +Version: 0.9.18 Release: 0 +# FIXME: use systemd once we have systemd >= 183 in Factory Url: http://upower.freedesktop.org/ Source: http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM upower-fix-resume-no-systemd.patch [email protected] -- Fix resuming when not booted with systemd, taken from git +Patch0: upower-fix-resume-no-systemd.patch BuildRequires: dbus-1-glib-devel BuildRequires: gobject-introspection-devel >= 0.9.9 BuildRequires: gtk-doc >= 1.11 @@ -33,8 +39,9 @@ BuildRequires: libusb-devel BuildRequires: polkit-devel BuildRequires: udev -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-daemon) +%endif BuildRequires: pkgconfig(systemd) %{?systemd_requires} Recommends: %{name}-lang @@ -91,18 +98,25 @@ %lang_package %prep %setup -q +%patch0 -p1 %build export V=1 %configure\ --disable-static \ --libexecdir=%{_libexecdir}/upower \ +%if %{with_systemd} + --enable-systemd \ +%endif --enable-gtk-doc make %{?_smp_mflags} %install %makeinstall rm -f %{buildroot}%{_libdir}/*.la +%if ! %{with_systemd} +rm %{buildroot}/lib/systemd/system-sleep/notify-upower.sh +%endif %find_lang %{name} %clean @@ -131,6 +145,9 @@ %{_bindir}/upower %dir %{_libexecdir}/upower %{_libexecdir}/upower/upowerd +%if %{with_systemd} +/lib/systemd/system-sleep/notify-upower.sh +%endif /lib/udev/rules.d/*.rules %{_unitdir}/upower.service %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UPower.conf ++++++ upower-fix-resume-no-systemd.patch ++++++ >From ac4042ffaf2a1730e45541103e361bed9d8379ae Mon Sep 17 00:00:00 2001 From: Jan Alexander Steffens (heftig) <[email protected]> Date: Sun, 02 Sep 2012 02:36:13 +0000 Subject: Send resume signal when built with systemd and using pm-utils suspend This case was apparently overlooked when adding systemd support. Signed-off-by: Jan Alexander Steffens (heftig) <[email protected]> Signed-off-by: Richard Hughes <[email protected]> --- diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c index ddd4472..52b430e 100644 --- a/src/linux/up-backend.c +++ b/src/linux/up-backend.c @@ -603,10 +603,11 @@ gboolean up_backend_emits_resuming (UpBackend *backend) { #ifdef HAVE_SYSTEMD - return TRUE; -#else - return FALSE; + if (sd_booted ()) + return TRUE; + else #endif + return FALSE; } /** -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
