Hello community, here is the log from the commit of package upower for openSUSE:Factory checked in at 2012-11-26 20:00:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-12 07:07:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.upower.new/upower.changes 2012-11-26 20:02:14.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 21 20:10:36 UTC 2012 - nmo.marques@gmail.com + +- Add 'pm-utils' to Recommends; gnome-power-manager and + mate-power-manager (at least) use upower for some features, some + features like suspend/hibernate only show if 'pm-utils' is also + installed. See bnc#790787. I believe this is an improvement. +- Add macro systemdutildir and fix broken build and drop FIXME + comment + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upower.spec ++++++ --- /var/tmp/diff_new_pack.LjnSJx/_old 2012-11-26 20:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.LjnSJx/_new 2012-11-26 20:02:37.000000000 +0100 @@ -20,6 +20,7 @@ %define with_systemd 1 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d +%define systemdutildir %(pkg-config --variable systemdutildir systemd) Name: upower Summary: Power Device Enumeration Framework @@ -27,7 +28,6 @@ Group: System/Daemons 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 vuntz@opensuse.org -- Fix resuming when not booted with systemd, taken from git @@ -47,6 +47,9 @@ BuildRequires: pkgconfig(systemd) %{?systemd_requires} Recommends: %{name}-lang +# bnc#790787 - upower calls /usr/bin/pm-is-supported, so a Recommends should be safe +# for reference see src/linux/up-backend.c +Recommends: pm-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: DeviceKit-power < 0.9.9 @@ -119,7 +122,7 @@ %makeinstall udevrulesdir=%{_udevrulesdir} rm -f %{buildroot}%{_libdir}/*.la %if ! %{with_systemd} -rm %{buildroot}/%{_unitdir}/../system-sleep/notify-upower.sh +rm %{buildroot}/%{systemdutildir}/system-sleep/notify-upower.sh %endif %find_lang %{name} @@ -150,7 +153,8 @@ %dir %{_libexecdir}/upower %{_libexecdir}/upower/upowerd %if %{with_systemd} -%{_unitdir}/../system-sleep/notify-upower.sh +%dir %{systemdutildir}/system-sleep +%{systemdutildir}/system-sleep/notify-upower.sh %endif %{_udevrulesdir}/*.rules %{_unitdir}/upower.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org