commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2014-12-19 09:41:24 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2014-11-28 08:47:12.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2014-12-19 09:40:21.0 +0100 @@ -1,0 +2,7 @@ +Sat Nov 29 02:03:00 UTC 2014 - Led + +- fix bashisms in sleep.d/* scripts +- add patches: + * pm-utils-fix-bashisms.patch + +--- New: pm-utils-fix-bashisms.patch Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.wziLle/_old 2014-12-19 09:40:22.0 +0100 +++ /var/tmp/diff_new_pack.wziLle/_new 2014-12-19 09:40:22.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package pm-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,7 @@ Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 # PATCH-FIX-OPENSUSE fix-99Zgrub-resume.patch boo#856391 wba...@tmo.at -- fix removal of set boot entry on resume in 99Zgrub Patch: fix-99Zgrub-resume.patch +Patch1: pm-utils-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # hooks requires some external tools @@ -70,6 +71,7 @@ %prep %setup -n %{name} -a 1 %patch -p1 +%patch1 -p1 %build %{configure} \ ++ pm-utils-fix-bashisms.patch ++ diff -Ndur pm-utils/pm/sleep.d/02rtcwake pm-utils-fix-bashisms/pm/sleep.d/02rtcwake --- pm-utils/pm/sleep.d/02rtcwake 2013-10-24 17:28:13.0 +0300 +++ pm-utils-fix-bashisms/pm/sleep.d/02rtcwake 2014-11-29 03:39:14.481291580 +0200 @@ -18,19 +18,19 @@ rtcwake_config_file="/etc/pm/config.d/rtcwake.config" -function start_of_day { +start_of_day() { echo `date -d "$1" "+%D"` } -function since_epoch { +since_epoch() { echo `date -d "$1" "+%s"` } -function day_of_week { +day_of_week() { echo `date -d "$1" "+%u"` } -function isAlarmDow { +isAlarmDow() { is=0 for dow in $RTCWAKE_DAYS; do if test "x$dow" = "x$1"; then @@ -41,7 +41,7 @@ echo $is } -function set_alarm +set_alarm() { # If USER_RTCWAKE_ALLOWED is yes and the user passed in a num_seconds_to_sleep variable, then # we will respect it (and ignore the system config) diff -Ndur pm-utils/pm/sleep.d/05nfscheck pm-utils-fix-bashisms/pm/sleep.d/05nfscheck --- pm-utils/pm/sleep.d/05nfscheck 2013-10-24 17:28:13.0 +0300 +++ pm-utils-fix-bashisms/pm/sleep.d/05nfscheck 2014-11-29 03:40:01.152288422 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Abort the hibernation process of there are NFS mounts # https://bugzilla.novell.com/show_bug.cgi?id=568132 # Author Carlos Robinson @@ -6,7 +6,7 @@ . "${PM_FUNCTIONS}" -function checknfsmount() { +checknfsmount() { [ -n "`mount | grep "type nfs" | grep -v "/proc/fs/nfsd"`" ] } diff -Ndur pm-utils/pm/sleep.d/06autofs pm-utils-fix-bashisms/pm/sleep.d/06autofs --- pm-utils/pm/sleep.d/06autofs2013-10-24 17:28:13.0 +0300 +++ pm-utils-fix-bashisms/pm/sleep.d/06autofs 2014-11-29 03:40:12.300287668 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . "${PM_FUNCTIONS}" diff -Ndur pm-utils/pm/sleep.d/30s2disk-check pm-utils-fix-bashisms/pm/sleep.d/30s2disk-check --- pm-utils/pm/sleep.d/30s2disk-check 2013-10-24 17:28:13.0 +0300 +++ pm-utils-fix-bashisms/pm/sleep.d/30s2disk-check 2014-11-29 03:41:14.318283473 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Stefan Seyfried, SUSE Linux Products GmbH, 2006 # mostly taken from the powersave project @@ -47,9 +47,9 @@ fi [ "$TYPE" != "partition" ] && continue [ "$DEV" != "$RESUME" ] && continue - FREE=$[($SIZE-$USED)*1024] # get free space on DEV + FREE=$((($SIZE - $USED) * 1024)) # get free space on DEV if [ $FREE -lt $IMAGE_SIZE ]; then - IMAGE_SIZE=$[$FREE-10*1024*1024] + IMAGE_SIZE=$(($FREE - 10 * 1024 * 1024)) fi OK=1 break # we found the partition, no need to look further diff -Ndur pm-utils/pm/sleep.d/45pcmcia pm-utils-fix-bashisms/pm/sleep.d/45pcmcia --- pm-utils/pm/sleep.d/45pcmcia
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2014-11-28 08:47:09 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2014-07-21 10:35:36.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2014-11-28 08:47:12.0 +0100 @@ -1,0 +2,6 @@ +Tue Nov 25 19:05:08 UTC 2014 - wba...@tmo.at + +- Added fix-99Zgrub-resume.patch: fix removal of set boot entry on + resume in 99Zgrub (boo#856391) + +--- New: fix-99Zgrub-resume.patch Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.e2whY3/_old 2014-11-28 08:47:13.0 +0100 +++ /var/tmp/diff_new_pack.e2whY3/_new 2014-11-28 08:47:13.0 +0100 @@ -33,6 +33,8 @@ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 +# PATCH-FIX-OPENSUSE fix-99Zgrub-resume.patch boo#856391 wba...@tmo.at -- fix removal of set boot entry on resume in 99Zgrub +Patch: fix-99Zgrub-resume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # hooks requires some external tools @@ -67,6 +69,7 @@ %prep %setup -n %{name} -a 1 +%patch -p1 %build %{configure} \ ++ fix-99Zgrub-resume.patch ++ diff -ur pm-utils.orig/pm/sleep.d/99Zgrub pm-utils/pm/sleep.d/99Zgrub --- pm-utils.orig/pm/sleep.d/99Zgrub2013-10-24 16:28:13.0 +0200 +++ pm-utils/pm/sleep.d/99Zgrub 2014-07-05 01:00:51.0 +0200 @@ -175,6 +175,7 @@ grub-once-restore() { echo "INFO: running grub-once-restore" + prepare-parameters rm -f "$GRUBDEFAULT" if [ -e "$GRUBDEFSAVE" ]; then echo " restoring original $GRUBDEFAULT" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2014-07-21 10:35:34 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-11-07 08:43:23.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2014-07-21 10:35:36.0 +0200 @@ -1,0 +2,6 @@ +Sat Jul 19 13:28:19 UTC 2014 - p.drou...@gmail.com + +- Remove insserv dependency; the package doesn't contain any init + script + +--- Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.f9cAjh/_old 2014-07-21 10:35:37.0 +0200 +++ /var/tmp/diff_new_pack.f9cAjh/_new 2014-07-21 10:35:37.0 +0200 @@ -35,8 +35,6 @@ Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq - # hooks requires some external tools BuildRequires: autoconf BuildRequires: m4 @@ -108,9 +106,6 @@ %{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig -%postun -%insserv_cleanup - %files %defattr (-,root,root) %doc README AUTHORS README.smart-suspend-to-RAM -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-11-07 08:43:22 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-11-06 11:02:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-11-07 08:43:23.0 +0100 @@ -4 +4 @@ --Fix Bug 807726 - Console loglevel (in kernel.printk) set too high after resuming from sleep or hibernation. +-Fix bnc#807726 - Console loglevel (in kernel.printk) set too high after resuming from sleep or hibernation. Other differences: -- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-11-06 11:02:05 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-08-04 17:06:22.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-11-06 11:02:06.0 +0100 @@ -1,0 +2,5 @@ +Fri Oct 25 11:42:52 UTC 2013 - vdziewie...@suse.com + +-Fix Bug 807726 - Console loglevel (in kernel.printk) set too high after resuming from sleep or hibernation. + +--- Old: pm-utils-1.4.1-suse-16.tar.bz2 New: pm-utils-1.4.1-suse-20131024.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.CwUmGb/_old 2013-11-06 11:02:07.0 +0100 +++ /var/tmp/diff_new_pack.CwUmGb/_new 2013-11-06 11:02:07.0 +0100 @@ -21,7 +21,7 @@ %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ # Please submit patches to git://gitorious.org/opensuse/pm-utils.git, # unless they are opensuse-version-specific. -%define gitversion 16 +%define gitversion 20131024 Name: pm-utils Version:1.4.1 @@ -33,14 +33,14 @@ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 -# Patch for https://bugzilla.novell.com/show_bug.cgi?id=817396 error in pm-powersave.log -# In git -#Patch1: intel-audio-powersave-bug817396.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq # hooks requires some external tools +BuildRequires: autoconf +BuildRequires: m4 +BuildRequires: perl BuildRequires: xmlto Requires: coreutils Requires: ethtool @@ -69,7 +69,6 @@ %prep %setup -n %{name} -a 1 -# %patch1 -p1 %build %{configure} \ ++ pm-utils-1.4.1-suse-16.tar.bz2 -> pm-utils-1.4.1-suse-20131024.tar.bz2 ++ 6934 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-08-04 17:06:21 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-05-13 15:16:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-08-04 17:06:22.0 +0200 @@ -1,0 +2,6 @@ +Fri Aug 2 11:26:31 UTC 2013 - vdziewie...@suse.com + +-Remove all power.d hooks as a next step to dropping pm-utils. +bnc#827854 + +--- Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.jP5GOd/_old 2013-08-04 17:06:22.0 +0200 +++ /var/tmp/diff_new_pack.jP5GOd/_new 2013-08-04 17:06:22.0 +0200 @@ -80,7 +80,7 @@ %install %{makeinstall} # bnc#663067 -%{__rm} %{buildroot}/%{pm_libdir}/power.d/harddrive +%{__rm} -r %{buildroot}/%{pm_libdir}/power.d/ # ibm bluetooth radio state handling was fixed # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/platform/x86/thinkpad_acpi.c?id=208b996b6c460285650d39b2330f8ef82c007d10 %{__rm} %{buildroot}/%{pm_libdir}/sleep.d/49bluetooth -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-05-13 15:16:00 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-05-07 15:32:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-05-13 15:16:02.0 +0200 @@ -1,0 +2,15 @@ +Tue May 7 18:14:38 UTC 2013 - crrodrig...@opensuse.org + +- remove pm/sleep.d/49bluetooth, ibm bluetooth radio status + handling was fixed in upstream kernel commit + 208b996b6c460285650d39b2330f8ef82c007d10 + thinkpad-acpi: preserve rfkill state across suspend/resume. + +--- +Tue May 7 06:03:28 UTC 2013 - crrodrig...@opensuse.org + +- remove pm/sleep.d/80videobios, uses package and + commands nowhere to be found, the time machine says + it was obsoleted by xorg-x11-driver-video. + +--- Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.Cd5FdU/_old 2013-05-13 15:16:03.0 +0200 +++ /var/tmp/diff_new_pack.Cd5FdU/_new 2013-05-13 15:16:03.0 +0200 @@ -81,6 +81,9 @@ %{makeinstall} # bnc#663067 %{__rm} %{buildroot}/%{pm_libdir}/power.d/harddrive +# ibm bluetooth radio state handling was fixed +# http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/platform/x86/thinkpad_acpi.c?id=208b996b6c460285650d39b2330f8ef82c007d10 +%{__rm} %{buildroot}/%{pm_libdir}/sleep.d/49bluetooth #FIXME: should be installed by make install %{__install} -m 644 man/*.1 %{buildroot}/%{_mandir}/man1 %{__install} -m 644 man/*.8 %{buildroot}/%{_mandir}/man8 @@ -94,7 +97,6 @@ %{__install} -m 0755 pm/sleep.d/45pcmcia %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/50rcnetwork %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/75ndiswrapper %{buildroot}/%{pm_libdir}/sleep.d/ -%{__install} -m 0755 pm/sleep.d/80videobios %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/99info %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0644 pm/config.d/* %{buildroot}/%{pm_sysconfdir}/ # powersave command is back -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-05-07 15:21:44 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-03-15 10:47:12.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-05-07 15:32:27.0 +0200 @@ -1,0 +2,13 @@ +Mon May 6 14:06:43 UTC 2013 - vdziewie...@suse.com + +- Applied intel-audio-powersave-bug817396.patch in git repo. + +--- +Fri Apr 26 14:55:18 UTC 2013 - d_wer...@gmx.net + +- correction for bnc#817396 +half of the correction for 797966 wwas lost during git integration. +here is a new patch which contains only the missing correction of +intel-audio-powersave_logoutput.diff + +--- Old: intel-audio-powersave_logoutput.diff pm-utils-1.4.1-suse-15.tar.bz2 pm-utils-dont-fail-modunload-silently.diff New: pm-utils-1.4.1-suse-16.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.55JMwI/_old 2013-05-07 15:32:29.0 +0200 +++ /var/tmp/diff_new_pack.55JMwI/_new 2013-05-07 15:32:29.0 +0200 @@ -21,7 +21,7 @@ %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ # Please submit patches to git://gitorious.org/opensuse/pm-utils.git, # unless they are opensuse-version-specific. -%define gitversion 15 +%define gitversion 16 Name: pm-utils Version:1.4.1 @@ -33,6 +33,9 @@ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 +# Patch for https://bugzilla.novell.com/show_bug.cgi?id=817396 error in pm-powersave.log +# In git +#Patch1: intel-audio-powersave-bug817396.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -66,6 +69,7 @@ %prep %setup -n %{name} -a 1 +# %patch1 -p1 %build %{configure} \ ++ pm-utils-1.4.1-suse-15.tar.bz2 -> pm-utils-1.4.1-suse-16.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils/pm/power.d/intel-audio-powersave new/pm-utils/pm/power.d/intel-audio-powersave --- old/pm-utils/pm/power.d/intel-audio-powersave 2013-02-25 15:58:59.0 +0100 +++ new/pm-utils/pm/power.d/intel-audio-powersave 2013-05-06 15:55:26.0 +0200 @@ -22,7 +22,7 @@ [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA for dev in /sys/module/snd_*; do [ -w "$dev/parameters/power_save" ] || continue - printf "Setting power savings for $s to %d..." "${dev##*/}" "$1" + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. done } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-03-15 10:47:10 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-02-04 21:01:51.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-03-15 10:47:12.0 +0100 @@ -1,0 +2,14 @@ +Tue Mar 12 14:55:55 UTC 2013 - vdziewie...@suse.com + +- Removed patches pm-utils-dont-fail-modunload-silently.diff and + intel-audio-powersave_logoutput.diff - applied them in git repo. + +- Deleted 80acpi-fan, since it used /proc/acpi/fan/ and it was removed from + kernel long ago. bnc#806635 + +- bnc#806632: rm pm/sleep.d/55NetworkManager, networkmanager + now uses Upower and listens to dbus resume/suspend signals. + +- remove rc.cpufreq - bnc#806641 + +--- Old: pm-utils-1.4.1-suse-12.tar.bz2 rc.cpufreq New: pm-utils-1.4.1-suse-15.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.W1z7bv/_old 2013-03-15 10:47:13.0 +0100 +++ /var/tmp/diff_new_pack.W1z7bv/_new 2013-03-15 10:47:13.0 +0100 @@ -19,7 +19,9 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ -%define gitversion 12 +# Please submit patches to git://gitorious.org/opensuse/pm-utils.git, +# unless they are opensuse-version-specific. +%define gitversion 15 Name: pm-utils Version:1.4.1 @@ -29,13 +31,8 @@ Group: System/Base Url:http://pm-utils.freedesktop.org/wiki/ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 -# http://gitorious.org/opensuse/pm-utils-suse +# http://gitorious.org/opensuse/pm-utils Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 -Source2:rc.cpufreq -# Patch inspired by https://bugzilla.novell.com/show_bug.cgi?id=633491 -Patch1: pm-utils-dont-fail-modunload-silently.diff -# Patch for https://bugzilla.novell.com/show_bug.cgi?id=797966 error in pm-powersave.log -Patch2: intel-audio-powersave_logoutput.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -69,8 +66,6 @@ %prep %setup -n %{name} -a 1 -%patch1 -p1 -%patch2 -p1 %build %{configure} \ @@ -95,7 +90,6 @@ %{__install} -m 0755 pm/sleep.d/45pcmcia %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/50rcnetwork %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/75ndiswrapper %{buildroot}/%{pm_libdir}/sleep.d/ -%{__install} -m 0755 pm/sleep.d/80acpi-fan %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/80videobios %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 pm/sleep.d/99info %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0644 pm/config.d/* %{buildroot}/%{pm_sysconfdir}/ @@ -108,25 +102,8 @@ # no arch-specific data, we put it in datadir. %{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig -# install cpufreq init script -install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/cpufreq -install -d -m 0755 %{buildroot}%{_sbindir} -ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq - -%preun -%stop_on_removal cpufreq - -%post -%fillup_and_insserv -f -y cpufreq - -%triggerun -- %{name} < 1.4.1-3 -# Forcefully enable the service on upgrades from versions where the service -# didn't exist or wasn't necessarily enabled by default. Without this, on -# upgrades, the service will not be enabled. -%insserv_force_if_yast cpufreq %postun -%restart_on_update cpufreq %insserv_cleanup %files @@ -134,7 +111,6 @@ %doc README AUTHORS README.smart-suspend-to-RAM %attr(0755,root,root) %{_bindir}/* %{_sbindir}/* -%config %{_sysconfdir}/init.d/cpufreq %{_sysconfdir}/pm/ %config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config %{pm_libdir} ++ pm-utils-1.4.1-suse-12.tar.bz2 -> pm-utils-1.4.1-suse-15.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils/pm/power.d/intel-audio-powersave new/pm-utils/pm/power.d/intel-audio-powersave --- old/pm-utils/pm/power.d/intel-audio-powersave 2013-01-28 13:09:41.0 +0100 +++ new/pm-utils/pm/power.d/intel-audio-powersave 2013-02-25 15:58:59.0 +0100 @@ -22,7 +22,7 @@ [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-02-04 21:01:50 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2013-01-17 15:18:43.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-02-04 21:01:51.0 +0100 @@ -1,0 +2,11 @@ +Mon Feb 4 12:19:54 UTC 2013 - vdziewie...@suse.com + +- Adopted to query network.service alias, that obsoletes the +NETWORKMANAGER variable in /etc/sysconfig/network/config +introduced in sysconfig-0.80. +- bnc#782891 unified grub2 and grub2-efi making grub2-efi just an +architecture of GRUB 2. Unify handling of both loaders to not +depend on compatibility grub2-efi-* links. + + +--- Old: pm-utils-1.4.1-suse-10.tar.bz2 New: pm-utils-1.4.1-suse-12.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.Kat5JH/_old 2013-02-04 21:01:52.0 +0100 +++ /var/tmp/diff_new_pack.Kat5JH/_new 2013-02-04 21:01:52.0 +0100 @@ -19,7 +19,7 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ -%define gitversion 10 +%define gitversion 12 Name: pm-utils Version:1.4.1 @@ -41,6 +41,7 @@ PreReq: %insserv_prereq # hooks requires some external tools +BuildRequires: xmlto Requires: coreutils Requires: ethtool Requires: gawk ++ pm-utils-1.4.1-suse-10.tar.bz2 -> pm-utils-1.4.1-suse-12.tar.bz2 ++ 9067 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2013-01-17 15:18:41 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-10-23 19:44:54.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2013-01-17 15:18:43.0 +0100 @@ -1,0 +2,8 @@ +Sun Jan 13 16:46:34 UTC 2013 - d_wer...@gmx.net + +- correction for bnc#797966 +intel-audio-powersave creates error entries in /var/log/pm-powersave.log +when it finds supported hw looping over /sys/module/snd_* +these errors are caused by simple typos + +--- New: intel-audio-powersave_logoutput.diff Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.ICz1Vh/_old 2013-01-17 15:18:44.0 +0100 +++ /var/tmp/diff_new_pack.ICz1Vh/_new 2013-01-17 15:18:44.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package pm-utils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Source2:rc.cpufreq # Patch inspired by https://bugzilla.novell.com/show_bug.cgi?id=633491 Patch1: pm-utils-dont-fail-modunload-silently.diff +# Patch for https://bugzilla.novell.com/show_bug.cgi?id=797966 error in pm-powersave.log +Patch2: intel-audio-powersave_logoutput.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -67,6 +69,7 @@ %prep %setup -n %{name} -a 1 %patch1 -p1 +%patch2 -p1 %build %{configure} \ ++ intel-audio-powersave_logoutput.diff ++ Author: d_wer...@gmx.net Date: 2013-01-13 Upstream: not yet. correction for bnc#797966 intel-audio-powersave creates error entries in /var/log/pm-powersave.log when it finds supported hw looping over /sys/module/snd_* these errors are caused by simple typos diff -Pdpru --- a/pm/power.d/intel-audio-powersave 2012-07-13 11:39:57.0 +0200 +++ b/pm/power.d/intel-audio-powersave 2013-01-10 23:10:37.0 +0100 @@ -22,7 +22,7 @@ audio_powersave() { [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA for dev in /sys/module/snd_*; do [ -w "$dev/parameters/power_save" ] || continue - printf "Setting power savings for $s to %d..." "{$dev##*/}" "$1" + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. done } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-10-23 19:44:53 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-09-15 17:29:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-10-23 19:44:54.0 +0200 @@ -1,0 +2,5 @@ +Sun Oct 21 12:59:40 UTC 2012 - seife+...@b1-systems.com + +- be more verbose on modunload failures (inspired by bnc#633491) + +--- New: pm-utils-dont-fail-modunload-silently.diff Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.nOp8Kq/_old 2012-10-23 19:45:00.0 +0200 +++ /var/tmp/diff_new_pack.nOp8Kq/_new 2012-10-23 19:45:00.0 +0200 @@ -32,6 +32,8 @@ # http://gitorious.org/opensuse/pm-utils-suse Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 Source2:rc.cpufreq +# Patch inspired by https://bugzilla.novell.com/show_bug.cgi?id=633491 +Patch1: pm-utils-dont-fail-modunload-silently.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -64,6 +66,7 @@ %prep %setup -n %{name} -a 1 +%patch1 -p1 %build %{configure} \ ++ pm-utils-dont-fail-modunload-silently.diff ++ Author: Stefan Seyfried Date: 2012-10-21 Upstream: not yet. Don't fail modunload silently, the inhibit file should contain a reason *why* it was created. This would have helped finding the "fix" for https://bugzilla.novell.com/show_bug.cgi?id=633491 :-) diff --git a/pm/sleep.d/75modules b/pm/sleep.d/75modules index 6555466..c02da38 100755 --- a/pm/sleep.d/75modules +++ b/pm/sleep.d/75modules @@ -8,7 +8,7 @@ suspend_modules() [ -z "$SUSPEND_MODULES" ] && return $NA for x in $SUSPEND_MODULES ; do printf "Unloading kernel module %s..." "$x" - modunload $x && echo Done. || { touch $INHIBIT; echo Failed.; } + modunload $x && echo Done. || { inhibit "Unloading kernel module $x failed."; echo Failed.; } done return 0 } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-09-15 17:29:24 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-09-13 00:06:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-09-15 17:29:25.0 +0200 @@ -1,0 +2,8 @@ +Thu Sep 13 23:26:44 UTC 2012 - jeng...@inai.de + +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags +- Use "modutils" provides for requiring a kernel module utility + implementation + +--- Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.tIjLYj/_old 2012-09-15 17:29:26.0 +0200 +++ /var/tmp/diff_new_pack.tIjLYj/_new 2012-09-15 17:29:26.0 +0200 @@ -41,7 +41,7 @@ Requires: ethtool Requires: gawk Requires: grep -Requires: module-init-tools +Requires: modutils Requires: sed Requires: upower @@ -51,13 +51,6 @@ hibernate computers that can be used to run vendor or distro supplied scripts on suspend and resume. -Authors: - -Bill Nottingham -Peter Jones -David Zeuthen -Richard Hughes - %package ndiswrapper Summary:The pm-utils hook for ndiswrapper Group: System/Base @@ -69,7 +62,6 @@ hibernate computers that can be used to run vendor or distro supplied scripts on suspend and resume. This package installs the 75ndiswrapper hook. - %prep %setup -n %{name} -a 1 @@ -77,7 +69,7 @@ %{configure} \ --docdir=%{_defaultdocdir}/%{name} \ --libdir=%{_prefix}/lib -%{__make} -d +make -d %{?_smp_mflags} %install %{makeinstall} @@ -114,9 +106,6 @@ install -d -m 0755 %{buildroot}%{_sbindir} ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq -%clean -rm -rf %{buildroot} - %preun %stop_on_removal cpufreq -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-09-13 00:05:56 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-07-10 14:05:07.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-09-13 00:06:08.0 +0200 @@ -1,0 +2,11 @@ +Wed Sep 12 12:02:50 UTC 2012 - vdziewie...@suse.com + +-Changed licence to GPL 2.0 (without +) - bnc#768867 + +--- +Wed Sep 12 11:41:09 UTC 2012 - vdziewie...@suse.com + +-Added Michael Chang's patch to fix grub2 menu shown after s2disk +(bnc#771587). + +--- Old: pm-utils-1.4.1-suse-9.tar.bz2 New: pm-utils-1.4.1-suse-10.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.UB9tqO/_old 2012-09-13 00:06:09.0 +0200 +++ /var/tmp/diff_new_pack.UB9tqO/_new 2012-09-13 00:06:09.0 +0200 @@ -19,13 +19,13 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ -%define gitversion 9 +%define gitversion 10 Name: pm-utils Version:1.4.1 Release:0 Summary:Tools to suspend and hibernate computers -License:GPL-2.0+ +License:GPL-2.0 Group: System/Base Url:http://pm-utils.freedesktop.org/wiki/ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 ++ pm-utils-1.4.1-suse-9.tar.bz2 -> pm-utils-1.4.1-suse-10.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils/pm/sleep.d/99Zgrub new/pm-utils/pm/sleep.d/99Zgrub --- old/pm-utils/pm/sleep.d/99Zgrub 2012-04-24 09:57:35.0 +0200 +++ new/pm-utils/pm/sleep.d/99Zgrub 2012-09-11 15:29:32.0 +0200 @@ -3,14 +3,38 @@ # Stefan Seyfried, SUSE Linux Products GmbH 2006, GPL v2 # mostly taken from the powersave project. -GRUBONCE="/usr/sbin/grubonce" -GRUBDEFAULT="/boot/grub/default" -GRUBDEFSAVE="/var/run/suspend.grubonce.default" +prepare-parameters() +{ + eval `grep LOADER_TYPE= /etc/sysconfig/bootloader` + + if [ x"$LOADER_TYPE" = "xgrub" ]; then + GRUBONCE="/usr/sbin/grubonce" + GRUBDEFAULT="/boot/grub/default" + GRUBDEFSAVE="/var/run/suspend.grubonce.default" + getkernels="getkernels-grub" + elif [ x"$LOADER_TYPE" = "xgrub2" ]; then + GRUBONCE="/usr/sbin/grub2-once" + GRUBDEFAULT="/boot/grub2/grubenv" + GRUBDEFSAVE="/var/run/suspend.grubonce.default" + GRUB2EDITENV="/usr/bin/grub2-editenv" + GRUB2CONF="/boot/grub2/grub.cfg" + BLKID="/usr/sbin/blkid" + getkernels="getkernels-grub2" + elif [ x"$LOADER_TYPE" = "xgrub2-efi" ]; then + GRUBONCE="/usr/sbin/grub2-once" + GRUBDEFAULT="/boot/grub2-efi/grubenv" + GRUBDEFSAVE="/var/run/suspend.grubonce.default" + GRUB2EDITENV="/usr/bin/grub2-efi-editenv" + GRUB2CONF="/boot/grub2-efi/grub.cfg" + BLKID="/usr/sbin/blkid" + getkernels="getkernels-grub2" + fi +} # # gets a list of available kernels from /boot/grub/menu.lst # kernels are in the array $KERNELS, output to stdout to be eval-ed. -getkernels() +getkernels-grub() { # DEBUG "Running getkernels()" INFO local MENU_LST="/boot/grub/menu.lst" @@ -68,6 +92,74 @@ done < $MENU_LST } +# +# gets a list of available kernels from /boot/grub2/grub.cfg +# kernels are in the array $KERNELS, output to stdout to be eval-ed. +getkernels-grub2() +{ + local I DUMMY MNT ROOTDEV + declare -i I=0 J=-1 + + # we need the root partition later to decide if this is the kernel to select + while read ROOTDEV MNT DUMMY; do + [ "$ROOTDEV" = "rootfs" ] && continue # not what we are searching for + if [ "$MNT" = "/" ]; then + break + fi + done < /proc/mounts + + while read LINE; do + case $LINE in + menuentry\ *) + let J++ + ;; + set\ default*) + local DEFAULT=${LINE#*default=} + + if echo $DEFAULT | grep -q
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-07-10 14:05:06 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-06-26 17:20:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-07-10 14:05:07.0 +0200 @@ -1,0 +2,6 @@ +Tue Jul 10 10:30:37 UTC 2012 - vdziewie...@suse.com + +-Further fix for bnc#753589 - powersave was not activated when +resuming from suspend on battery. + +--- Old: pm-utils-1.4.1-suse-8.tar.bz2 New: pm-utils-1.4.1-suse-9.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.JUuCcv/_old 2012-07-10 14:05:11.0 +0200 +++ /var/tmp/diff_new_pack.JUuCcv/_new 2012-07-10 14:05:11.0 +0200 @@ -19,7 +19,7 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ -%define gitversion 8 +%define gitversion 9 Name: pm-utils Version:1.4.1 ++ pm-utils-1.4.1-suse-8.tar.bz2 -> pm-utils-1.4.1-suse-9.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils/pm/sleep.d/00powersave new/pm-utils/pm/sleep.d/00powersave --- old/pm-utils/pm/sleep.d/00powersave 2012-06-04 20:16:59.0 +0200 +++ new/pm-utils/pm/sleep.d/00powersave 2012-07-10 12:20:00.0 +0200 @@ -6,7 +6,7 @@ case $1 in suspend|hibernate) on_ac_power || pm-powersave false ;; -resume|thaw) on_ac_power || pm-powersave false ;; +resume|thaw) on_ac_power || pm-powersave ;; *) exit $NA ;; esac exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-06-26 17:20:54 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-04-23 09:16:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-06-26 17:20:56.0 +0200 @@ -1,0 +2,22 @@ +Thu Jun 21 17:06:30 UTC 2012 - vdziewie...@suse.com + +-Fixed bnc#697379 - Powermanagement snd_hda_intel - Skript /usr/lib/pm-utils/intel-audio-powersave doesnt' work + + +--- +Wed Jun 20 14:20:38 UTC 2012 - vdziewie...@suse.com + +-Fixed 06autofs, it now works only if NetworkManager is not +running, because it has it's own way to start autofs. +Fix regression caused by fix for bnc#753589-Using a savestate/restorestate scheme instead + +--- +Fri May 11 09:27:30 UTC 2012 - vdziewie...@suse.com + +-bnc#751621 (again): Test systemd presence (/proc/1/comm) and +choose either systemctl or /sbin/service when stopping and +restarting services. This should make the services stop and start properly, +but avoid dumping binary crap in the log (bnc#75181). + + +--- Old: pm-utils-1.4.1-suse-4.tar.bz2 New: pm-utils-1.4.1-suse-8.tar.bz2 rc.cpufreq Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.IU6RHE/_old 2012-06-26 17:20:59.0 +0200 +++ /var/tmp/diff_new_pack.IU6RHE/_new 2012-06-26 17:20:59.0 +0200 @@ -19,7 +19,7 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ -%define gitversion 4 +%define gitversion 8 Name: pm-utils Version:1.4.1 @@ -31,6 +31,7 @@ Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils-suse Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 +Source2:rc.cpufreq BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -108,15 +109,36 @@ # no arch-specific data, we put it in datadir. %{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig +# install cpufreq init script +install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/cpufreq +install -d -m 0755 %{buildroot}%{_sbindir} +ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq %clean rm -rf %{buildroot} +%preun +%stop_on_removal cpufreq + +%post +%fillup_and_insserv -f -y cpufreq + +%triggerun -- %{name} < 1.4.1-3 +# Forcefully enable the service on upgrades from versions where the service +# didn't exist or wasn't necessarily enabled by default. Without this, on +# upgrades, the service will not be enabled. +%insserv_force_if_yast cpufreq + +%postun +%restart_on_update cpufreq +%insserv_cleanup + %files %defattr (-,root,root) %doc README AUTHORS README.smart-suspend-to-RAM %attr(0755,root,root) %{_bindir}/* %{_sbindir}/* +%config %{_sysconfdir}/init.d/cpufreq %{_sysconfdir}/pm/ %config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config %{pm_libdir} ++ pm-utils-1.4.1-suse-4.tar.bz2 -> pm-utils-1.4.1-suse-8.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils/pm/functions.in new/pm-utils/pm/functions.in --- old/pm-utils/pm/functions.in2012-03-27 11:11:35.0 +0200 +++ new/pm-utils/pm/functions.in2012-04-26 13:12:31.0 +0200 @@ -143,16 +143,36 @@ stopservice() { - if service "$1" status 2>/dev/null | grep -q -e running -e started + if test `cat /proc/1/comm` = "systemd" then - touch "${STORAGEDIR}/service:$1" - SYSTEMD_NO_WRAP=yes service "$1" stop + + if systemctl status "$1".service + then + touch "${STORAGEDIR}/service:$1" + systemctl stop "$1".service + fi + + else + if service "$1" status 2>/dev/null | grep -q -e running -e started + then + touch "${STORAGEDIR}/service:$1" + service "$1" stop + fi fi } restartservice() { - [ -O "${STORAGEDIR}/service:$1" ] && SYSTEMD_NO_WRAP=yes service "$1" start
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-04-23 09:16:14 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "vdziewie...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-03-01 07:26:20.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-04-23 09:16:19.0 +0200 @@ -1,0 +2,13 @@ +Thu Apr 19 08:24:13 UTC 2012 - vdziewie...@suse.com + +-Created a git repository at g...@gitorious.org:opensuse/pm-utils.git as a branch of +git://anongit.freedesktop.org/git/pm-utils, to avoid having suse +hooks in a separate package, using this repository (all patches +removed as they are included there) +-Fixed bnc#751887 - Hibernation failure after security patches applied; +-Fixed bnc#751621 - /usr/lib/pm-utils/sleep.d/06autofs unconditionally (re)starts autofs +-Fixed bnc#751811 - pm-suspend generates defective /var/log/pm-suspend.log file +-Fixed bnc#753589 - sysctl.conf settings are lost when changing +powerstate +-Fixed bnc#633496 - /usr/lib/pm-utils/sleep.d/75modules should cancel suspend2disk when unloading a module fails +--- Old: pm-utils-1.2.6.1-fix-broken-dbus-send.diff pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch pm-utils-1.3.0-suse-grub.patch pm-utils-1.3.0-suse-logging.patch pm-utils-1.3.0-suse-smart-uswsusp.patch pm-utils-1.4.1-suse-config.patch pm-utils-1.4.1.tar.bz2 pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 New: pm-utils-1.4.1-suse-4.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.WTMu5q/_old 2012-04-23 09:16:20.0 +0200 +++ /var/tmp/diff_new_pack.WTMu5q/_new 2012-04-23 09:16:20.0 +0200 @@ -19,6 +19,7 @@ %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ +%define gitversion 4 Name: pm-utils Version:1.4.1 @@ -27,22 +28,9 @@ License:GPL-2.0+ Group: System/Base Url:http://pm-utils.freedesktop.org/wiki/ -Source0:%{name}-%{version}.tar.bz2 +Source0:%{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils-suse -Source1:pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 -Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 -#PATCH-FIX-OPENSUSE: fixes a dbus-send call -Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff -#PATCH-FIX-OPENSUSE: make the uswsusp module default on SUSE and port the "smart" behavior -Patch1: pm-utils-1.3.0-suse-smart-uswsusp.patch -#PATCH-FIX-OPENSUSE: add some aditional config variables for pm-utils-suse -Patch2: pm-utils-1.4.1-suse-config.patch -#PATCH-FIX-OPENSUSE: more SUSE friendly grub handler -Patch3: pm-utils-1.3.0-suse-grub.patch -#PATCH-FIX-OPENSUSE: setup also kernel loglevel to show up the progress bar -Patch4: pm-utils-1.3.0-suse-logging.patch -#PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995 -Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch +Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -82,19 +70,13 @@ %prep -%setup -q -b 1 -a 2 -%patch0 -p1 -b .broken-dbus -%patch1 -p1 -b .smart-swsusp -%patch2 -p1 -b .suse-config -%patch3 -p1 -b .suse-grub -%patch4 -p1 -b .suse-logging -%patch5 -p1 -b .directfb-ignore-fbmodes +%setup -n %{name} -a 1 %build %{configure} \ --docdir=%{_defaultdocdir}/%{name} \ --libdir=%{_prefix}/lib -%{__make} +%{__make} -d %install %{makeinstall} @@ -107,12 +89,18 @@ %{__install} -d -m 0755 %{buildroot}%{pm_quirkdbdir} %{__install} -m 0644 *.quirkdb %{buildroot}%{pm_quirkdbdir} #SUSE hooks -pushd ../pm-utils-suse -%{__install} -m 0755 hooks/sleep.d/* %{buildroot}/%{pm_libdir}/sleep.d/ -%{__install} -m 0644 hooks/config.d/* %{buildroot}/%{pm_sysconfdir}/ +%{__install} -m 0755 pm/sleep.d/02rtcwake %{buildroot}/%{pm_libdir}/sleep.d/ +%{__install} -m 0755 pm/sleep.d/06autofs %{buildroot}/%{pm_libdir}/sleep.d/ +%{__install} -m 0755 pm/sleep.d/30s2disk-check %{buildroot}/%{pm_libdir}/sleep.d/ +%{__install} -m 0755 pm/sleep.d/45pcmcia %{buildroot}/%{pm_libdir}/sleep.d/ +%{__install} -m 0755 pm/sleep.d/50rcnetwork %{buildroot}/%{pm_libdir}/sleep.d/ +%{__install} -m 0755 pm/sleep.d/75ndiswrapper %{buildroot}/%{pm_libdir}/sleep.d/ +%{_
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-03-01 07:25:53 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "mvysko...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2012-02-16 16:23:03.0 +0100 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-03-01 07:26:20.0 +0100 @@ -1,0 +2,7 @@ +Tue Feb 28 14:45:13 UTC 2012 - mvysko...@suse.cz + +- fix script 50rcnetwork error and update savestate/restorestate + functions(bnc#749031). +- obsolete pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch already in git + +--- Old: pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 New: pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.MxKbEt/_old 2012-03-01 07:26:21.0 +0100 +++ /var/tmp/diff_new_pack.MxKbEt/_new 2012-03-01 07:26:21.0 +0100 @@ -29,7 +29,7 @@ Url:http://pm-utils.freedesktop.org/wiki/ Source0:%{name}-%{version}.tar.bz2 # http://gitorious.org/opensuse/pm-utils-suse -Source1:pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 +Source1:pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 #PATCH-FIX-OPENSUSE: fixes a dbus-send call Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff @@ -43,18 +43,17 @@ Patch4: pm-utils-1.3.0-suse-logging.patch #PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995 Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch -Patch11:pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq # hooks requires some external tools -Requires: grep -Requires: sed +Requires: coreutils Requires: ethtool Requires: gawk -Requires: coreutils +Requires: grep Requires: module-init-tools +Requires: sed Requires: upower @@ -90,8 +89,6 @@ %patch3 -p1 -b .suse-grub %patch4 -p1 -b .suse-logging %patch5 -p1 -b .directfb-ignore-fbmodes -cd .. -%patch11 -p0 %build %{configure} \ ++ pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 -> pm-utils-suse-41cb0c42e5f739b73d66f7a5de0d6d4d92b3c375.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pm-utils-suse/bin/powersave new/pm-utils-suse/bin/powersave --- old/pm-utils-suse/bin/powersave 2010-09-20 13:36:41.0 +0200 +++ new/pm-utils-suse/bin/powersave 2012-02-28 15:43:13.0 +0100 @@ -54,7 +54,7 @@ continue fi # type 2 is battery -if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then +if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then echo "${DEVICE}" fi done @@ -63,7 +63,7 @@ # print the ac_adapter found on system # Note: it prints the first match, as it expects only one per machine function upower_find_ac_adapter() { -for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do +for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do # type 1 is Line Power if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then echo "${DEVICE}" @@ -193,20 +193,24 @@ done } +function dbus-getv { + sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" +} + function upower_battery_info { C=1 for BATTERY in `upower_enumerate_batteries`; do -SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` +let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" if [ $SEC -ne 0 ]; then let MIN=SEC/60 else MIN=0 fi - PERC=`upower_device_get_property "${BATTERY}" Percentage` + PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` -case `upower_device_get_property "${BATTERY}" State` in +case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in 1) STATE="Charging" ;; 2) STATE="Discharging" ;;
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2012-02-16 16:22:57 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "mvysko...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes2011-09-23 12:41:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2012-02-16 16:23:03.0 +0100 @@ -1,0 +2,6 @@ +Tue Feb 14 17:45:32 UTC 2012 - crrodrig...@opensuse.org + +- Remove init script, obsoleted by opensuse-kernel commit + 6efe9b5949513b33987e51400da8c75e7225970d + +--- Old: rc.cpufreq Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.GHZm6p/_old 2012-02-16 16:23:05.0 +0100 +++ /var/tmp/diff_new_pack.GHZm6p/_new 2012-02-16 16:23:05.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package pm-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks @@ -23,7 +22,7 @@ Name: pm-utils Version:1.4.1 -Release:9 +Release:0 Summary:Tools to suspend and hibernate computers License:GPL-2.0+ Group: System/Base @@ -32,7 +31,6 @@ # http://gitorious.org/opensuse/pm-utils-suse Source1:pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2 Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 -Source3:rc.cpufreq #PATCH-FIX-OPENSUSE: fixes a dbus-send call Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff #PATCH-FIX-OPENSUSE: make the uswsusp module default on SUSE and port the "smart" behavior @@ -73,7 +71,6 @@ Richard Hughes %package ndiswrapper -License:GPL-2.0+ Summary:The pm-utils hook for ndiswrapper Group: System/Base Supplements:ndiswrapper @@ -126,36 +123,15 @@ # no arch-specific data, we put it in datadir. %{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig -# install cpufreq init script -install -D -m 0755 %{S:3} %{buildroot}%{_sysconfdir}/init.d/cpufreq -install -d -m 0755 %{buildroot}%{_sbindir} -ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq %clean rm -rf %{buildroot} -%preun -%stop_on_removal cpufreq - -%post -%fillup_and_insserv -f -y cpufreq - -%triggerun -- %{name} < 1.4.1-3 -# Forcefully enable the service on upgrades from versions where the service -# didn't exist or wasn't necessarily enabled by default. Without this, on -# upgrades, the service will not be enabled. -%insserv_force_if_yast cpufreq - -%postun -%restart_on_update cpufreq -%insserv_cleanup - %files %defattr (-,root,root) %doc README ChangeLog AUTHORS ../pm-utils-suse/doc/README.smart-suspend-to-RAM %attr(0755,root,root) %{_bindir}/* %{_sbindir}/* -%config %{_sysconfdir}/init.d/cpufreq %{_sysconfdir}/pm/ %config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config %{pm_libdir} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2011-12-06 18:52:17 Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) Package is "pm-utils", Maintainer is "mvysko...@suse.com" Changes: Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.dOphFV/_old 2011-12-06 19:25:46.0 +0100 +++ /var/tmp/diff_new_pack.dOphFV/_new 2011-12-06 19:25:47.0 +0100 @@ -25,7 +25,7 @@ Version:1.4.1 Release:9 Summary:Tools to suspend and hibernate computers -License:GPLv2+ +License:GPL-2.0+ Group: System/Base Url:http://pm-utils.freedesktop.org/wiki/ Source0:%{name}-%{version}.tar.bz2 @@ -73,7 +73,7 @@ Richard Hughes %package ndiswrapper -License:GPLv2+ +License:GPL-2.0+ Summary:The pm-utils hook for ndiswrapper Group: System/Base Supplements:ndiswrapper -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Wed Mar 2 15:12:15 CET 2011. --- pm-utils/pm-utils.changes 2011-03-01 09:33:50.0 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2011-03-02 15:01:53.0 +0100 @@ -1,0 +2,6 @@ +Wed Mar 2 14:01:03 UTC 2011 - estel...@elstel.com + +- Show battery and AC-adpater (power adapter) status when working + without X under a console: upower is used (bnc#670074) + +--- @@ -33,0 +40 @@ +>>> ./pm-utils.changes.rc13d0ced37ad6aae6e3d140dad6f4c2b calling whatdependson for head-i586 New: pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.bLIM8G/_old 2011-03-02 15:12:00.0 +0100 +++ /var/tmp/diff_new_pack.bLIM8G/_new 2011-03-02 15:12:00.0 +0100 @@ -23,7 +23,7 @@ Name: pm-utils Version:1.4.1 -Release:8 +Release:9 Summary:Tools to suspend and hibernate computers License:GPLv2+ Group: System/Base @@ -45,6 +45,7 @@ Patch4: pm-utils-1.3.0-suse-logging.patch #PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995 Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch +Patch11:pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq @@ -92,6 +93,8 @@ %patch3 -p1 -b .suse-grub %patch4 -p1 -b .suse-logging %patch5 -p1 -b .directfb-ignore-fbmodes +cd .. +%patch11 -p0 %build %{configure} \ ++ pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch ++ *** pm-utils-suse/bin/powersave 2011-03-01 21:18:38.351062624 +0100 *** pm-utils-suse/bin/powersave 2011-03-01 21:25:43.213064195 +0100 *** *** 54,60 continue fi # type 2 is battery ! if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then echo "${DEVICE}" fi done --- 54,60 continue fi # type 2 is battery ! if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then echo "${DEVICE}" fi done *** *** 63,69 # print the ac_adapter found on system # Note: it prints the first match, as it expects only one per machine function upower_find_ac_adapter() { ! for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do # type 1 is Line Power if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then echo "${DEVICE}" --- 63,69 # print the ac_adapter found on system # Note: it prints the first match, as it expects only one per machine function upower_find_ac_adapter() { ! for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do # type 1 is Line Power if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then echo "${DEVICE}" *** *** 193,212 done } function upower_battery_info { C=1 for BATTERY in `upower_enumerate_batteries`; do ! SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` if [ $SEC -ne 0 ]; then let MIN=SEC/60 else MIN=0 fi ! PERC=`upower_device_get_property "${BATTERY}" Percentage` ! case `upower_device_get_property "${BATTERY}" State` in 1) STATE="Charging" ;; 2) STATE="Discharging" ;; 3) STATE="Empty" ;; --- 193,216 done } + function dbus-getv { + sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" + } + function upower_battery_info { C=1 for BATTERY in `upower_enumerate_batteries`; do ! let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" if [ $SEC -ne 0 ]; then let MIN=SEC/60 else MIN=0 fi ! PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` ! case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in 1) STATE="Charging" ;; 2) STATE="Discharging" ;; 3) STATE="Empty" ;; *** *** 217,223 esac echo "Battery$C:" ! echo -e "\t Remaining percent: $PERC" echo -e "\t Remaining minutes: $MIN" echo -e "\t Charging state: $STATE" --- 221,227 esac echo "Battery$C:" ! echo -e "\t Remaining percent: $PERC%"
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Tue Mar 1 10:08:04 CET 2011. --- pm-utils/pm-utils.changes 2011-02-13 23:23:43.0 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2011-03-01 09:33:50.0 +0100 @@ -1,0 +2,5 @@ +Tue Mar 1 08:29:54 UTC 2011 - mvysko...@suse.cz + +- Fix bnc#663067 - remove harddrive power.d hook + +--- calling whatdependson for head-i586 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.1A34z4/_old 2011-03-01 10:06:58.0 +0100 +++ /var/tmp/diff_new_pack.1A34z4/_new 2011-03-01 10:06:58.0 +0100 @@ -23,7 +23,7 @@ Name: pm-utils Version:1.4.1 -Release:7 +Release:8 Summary:Tools to suspend and hibernate computers License:GPLv2+ Group: System/Base @@ -101,6 +101,8 @@ %install %{makeinstall} +# bnc#663067 +%{__rm} %{buildroot}/%{pm_libdir}/power.d/harddrive #FIXME: should be installed by make install %{__install} -m 644 man/*.1 %{buildroot}/%{_mandir}/man1 %{__install} -m 644 man/*.8 %{buildroot}/%{_mandir}/man8 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pm-utils for openSUSE:Factory
Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Sun Feb 20 19:51:08 CET 2011. --- pm-utils/pm-utils.changes 2011-01-26 23:39:21.0 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2011-02-13 23:23:43.0 +0100 @@ -1,0 +2,8 @@ +Sun Feb 13 23:19:38 CET 2011 - vu...@opensuse.org + +- Use a %triggerun on pm-utils < 1.4.1-3 (should be this version) + to forcefully enable the cpufreq service, since else, it's not + enabled on upgrades. Thanks to Kay Sievers for the hint! + Fix bnc#653540. + +--- calling whatdependson for head-i586 Other differences: -- ++ pm-utils.spec ++ --- /var/tmp/diff_new_pack.jsua4N/_old 2011-02-20 19:51:06.0 +0100 +++ /var/tmp/diff_new_pack.jsua4N/_new 2011-02-20 19:51:06.0 +0100 @@ -23,7 +23,7 @@ Name: pm-utils Version:1.4.1 -Release:2 +Release:7 Summary:Tools to suspend and hibernate computers License:GPLv2+ Group: System/Base @@ -135,6 +135,12 @@ %post %fillup_and_insserv -f -y cpufreq +%triggerun -- %{name} < 1.4.1-3 +# Forcefully enable the service on upgrades from versions where the service +# didn't exist or wasn't necessarily enabled by default. Without this, on +# upgrades, the service will not be enabled. +%insserv_force_if_yast cpufreq + %postun %restart_on_update cpufreq %insserv_cleanup Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org