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.changes 2014-07-21 10:35:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2014-11-28 08:47:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 25 19:05:08 UTC 2014 - wbauer@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.000000000 +0100 +++ /var/tmp/diff_new_pack.e2whY3/_new 2014-11-28 08:47:13.000000000 +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 wbauer@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/99Zgrub 2013-10-24 16:28:13.000000000 +0200 +++ pm-utils/pm/sleep.d/99Zgrub 2014-07-05 01:00:51.000000000 +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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org