commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2015-03-16 06:58:15 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2015-02-27 11:07:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2015-03-16 06:58:17.0 +0100 @@ -1,0 +2,5 @@ +Wed Mar 11 14:35:10 UTC 2015 - bwiedem...@suse.com + +- use initrd macros to not run on each package update (bnc#881780) + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.48gARZ/_old 2015-03-16 06:58:18.0 +0100 +++ /var/tmp/diff_new_pack.48gARZ/_new 2015-03-16 06:58:18.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany # # All modifications and additions to the file contributed by third parties @@ -30,6 +30,7 @@ BuildRequires: libtool BuildRequires: pciutils-devel BuildRequires: pkgconfig +BuildRequires: suse-module-tools %if 0%{?mandriva_version} BuildRequires: liblzo-devel %else @@ -153,10 +154,8 @@ fi if [ $YAST_IS_RUNNING != instsys -a \ ! -e /.buildenv -a \ - -x /sbin/update-bootloader -a \ - -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - /sbin/update-bootloader --refresh + -x /sbin/update-bootloader ]; then + %{?regenerate_initrd_post} fi %if 0%{?suse_version} 1310 if [ `grep ^[[:blank:]]*encrypt[[:blank:]]*=[[:blank:]]*y /etc/suspend.conf` ]; then @@ -170,6 +169,9 @@ fi %endif +%posttrans +%{?regenerate_initrd_posttrans} + %postun if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then echo Skipping recreation of existing initial ramdisks, due -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2015-02-27 11:07:54 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2014-11-28 08:45:59.0 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2015-02-27 11:07:55.0 +0100 @@ -1,0 +2,6 @@ +Mon Feb 23 14:47:54 UTC 2015 - rguent...@suse.com + +- Build with -std=gnu89 as GCC 5 defaults to -std=gnu11 and that + breaks build due to changed semantics of 'inline'. + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.mhscjh/_old 2015-02-27 11:07:56.0 +0100 +++ /var/tmp/diff_new_pack.mhscjh/_new 2015-02-27 11:07:56.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany # # All modifications and additions to the file contributed by third parties @@ -111,7 +111,7 @@ #cp -vb --suffix=-0.5 %{S:99} whitelist.c %build -export CFLAGS=$RPM_OPT_FLAGS +export CFLAGS=-std=gnu89 $RPM_OPT_FLAGS autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2014-11-28 08:45:54 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2014-05-14 10:26:04.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2014-11-28 08:45:59.0 +0100 @@ -1,0 +2,6 @@ +Fri Nov 21 12:59:44 UTC 2014 - seife+...@b1-systems.com + +- remove mkinitrd scripts, mkinitrd is no longer used and it seems + to work with dracut already (bsc#893574) + +--- Old: mkinitrd-boot.kernel.sh mkinitrd-boot.userspace.sh Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.088OFP/_old 2014-11-28 08:46:00.0 +0100 +++ /var/tmp/diff_new_pack.088OFP/_new 2014-11-28 08:46:00.0 +0100 @@ -48,8 +48,6 @@ Source: http://sourceforge.net/projects/suspend/files/suspend/suspend-1.0/%name-utils-%{version}.tar.bz2 Source2:configure-suspend-encryption.sh Source3:README.scripts -Source4:mkinitrd-boot.kernel.sh -Source5:mkinitrd-boot.userspace.sh Patch1: suspend-comment-configfile-options.diff Patch2: suspend-susescripts.diff Patch3: suspend-default-compress.diff @@ -134,9 +132,6 @@ %install install -d $RPM_BUILD_ROOT/etc make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh -install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.userspace.sh %if 0%{?suse_version} 1320 install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ touch $RPM_BUILD_ROOT/etc/suspend.key @@ -188,10 +183,6 @@ %files %defattr (-,root,root) %config /etc/suspend.conf -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-resume.kernel.sh -/lib/mkinitrd/scripts/boot-resume.userspace.sh /usr/sbin/s2disk /usr/sbin/s2ram /usr/sbin/s2both -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2014-05-14 10:26:02 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2014-01-10 21:22:23.0 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2014-05-14 10:26:04.0 +0200 @@ -1,0 +2,11 @@ +Sun May 11 16:35:29 UTC 2014 - co...@suse.com + +- disable plymouth support once and for all - plymouth no longer + offers half the API, remove suspend-plymouth.patch + +--- +Tue Mar 4 18:33:34 UTC 2014 - tr...@suse.de + +- Prerequires for grep was missing (bnc#865841) + +--- Old: suspend-plymouth.patch Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.PZXDnZ/_old 2014-05-14 10:26:05.0 +0200 +++ /var/tmp/diff_new_pack.PZXDnZ/_new 2014-05-14 10:26:05.0 +0200 @@ -30,7 +30,6 @@ BuildRequires: libtool BuildRequires: pciutils-devel BuildRequires: pkgconfig -BuildRequires: plymouth-devel %if 0%{?mandriva_version} BuildRequires: liblzo-devel %else @@ -39,6 +38,7 @@ %ifarch %ix86 x86_64 BuildRequires: libx86-devel %endif +Requires(pre): grep Version:1.0 Release:0 Summary:A Set Of Tools To Support Sleep Modes @@ -64,8 +64,6 @@ Patch17:suspend-dont-exclude-s390.patch Patch18:s2disk-do-not-fail-without-local-terminals.patch Patch19:s2disk-disable-splash-when-unable-to-switch-vts.patch -#Mandriva patch to enable plymouth support (Thanks to F. Crozat) -Patch20:suspend-plymouth.patch Patch21:suspend-ignore-acpi-video-flags-not-available.patch Patch22:whitelist_ibm_iplex_dx360_s2ram.patch # fix for automake-1.13.1 @@ -106,7 +104,6 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 @@ -126,7 +123,7 @@ %else --enable-encrypt \ %endif ---enable-plymouth \ +--disable-plymouth \ --disable-splashy \ --disable-resume-static \ --enable-threads \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2013-12-17 10:06:08 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2013-08-12 16:15:55.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2013-12-17 10:06:10.0 +0100 @@ -1,0 +2,5 @@ +Mon Dec 16 10:52:42 UTC 2013 - dval...@suse.com + +- enable ppc64le (ppc64le.patch) + +--- New: ppc64le.patch Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.wdlGcK/_old 2013-12-17 10:06:10.0 +0100 +++ /var/tmp/diff_new_pack.wdlGcK/_new 2013-12-17 10:06:10.0 +0100 @@ -70,8 +70,9 @@ # fix for automake-1.13.1 Patch23:suspend-automake-1_13.diff Patch100: remove-swich-message-for-s390x.diff +Patch101: ppc64le.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 ppc ppc64 +ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le %if 0%{?suse_version} Supplements:powersave %endif @@ -109,6 +110,7 @@ %patch22 -p1 %patch23 -p1 %patch100 -p1 +%patch101 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++ ppc64le.patch ++ Index: suspend-utils-1.0/configure.ac === --- suspend-utils-1.0.orig/configure.ac +++ suspend-utils-1.0/configure.ac @@ -142,7 +142,7 @@ case ${host} in i?86-*) ARCH=x86;; x86_*-*)ARCH=x86;; ppc-*|powerpc-*)ARCH=ppc;; - ppc64-*|powerpc64-*)ARCH=ppc;; + ppc64*|powerpc64*) ARCH=ppc;; s390*) ARCH=ppc;; esac -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2013-08-12 16:15:54 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2013-04-05 17:06:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2013-08-12 16:15:55.0 +0200 @@ -1,0 +2,17 @@ +Fri Aug 9 07:42:32 UTC 2013 - mch...@suse.com + +- [openSUSE goes SLE12]: suspend: Change and/or patches may have + been lost (bnc#831865) +- add following patch and corresponding changelog from SLE11 + remove-swich-message-for-s390x.diff + s2disk-disable-splash-when-unable-to-switch-vts.patch + s2disk-do-not-fail-without-local-terminals.patch + suspend-dont-exclude-s390.patch + suspend-ignore-acpi-video-flags-not-available.patch + whitelist_ibm_iplex_dx360_s2ram.patch +- suspend-do-not-apply-quirks-if-KMS-driver-is-in-use.patch is + upstreamed so not included +- s2disk-do-not-fail-hibernation-withoug-a-vt-console is removed + becasue same with s2disk-do-not-fail-without-local-terminals.patch + +--- @@ -6,0 +24,5 @@ +Wed Apr 3 07:45:09 UTC 2013 - tr...@suse.de + +- Whitelist iplex dx360 M4 more general to get all of them (bnc#813062) + +--- @@ -16,0 +39,12 @@ +Tue Jan 15 16:10:20 UTC 2013 - tr...@suse.de + +- Whitelist iplex dx360 M4 for s2ram (bnc#797754, fate#313990) + +--- +Wed Dec 5 10:49:02 CET 2012 - hma...@suse.de + +- add suspend-ignore-acpi-video-flags-not-available.patch: + Don't bail out if /proc/acpi/acpi_video_flags is not available, + try anyway (bnc#788372) + +--- @@ -49,0 +84,5 @@ +Wed Dec 7 18:29:40 CET 2011 - i...@suse.de + +- Remove confusing message for s390x (bnc#723835) + +--- @@ -54,0 +94,7 @@ +Thu Nov 24 15:01:20 CET 2011 - hma...@suse.de + +- add patch: + s2disk-disable-splash-when-unable-to-switch-vts.patch + (bnc#723835) + +--- @@ -59,0 +106,6 @@ +Wed Jun 22 10:07:07 CEST 2011 - hma...@suse.de + +- add patch: s2disk-do-not-fail-without-local-terminals.patch + (bnc#592780,fate#309479) + +--- @@ -78,0 +131,6 @@ + +--- +Thu Jan 21 12:24:45 CET 2010 - hma...@suse.de + +- Enable build for s390(x) (bnc#568268) +- Add suspend-dont-exclude-s390.patch Old: s2disk-do-not-fail-hibernation-withoug-a-vt-console New: remove-swich-message-for-s390x.diff s2disk-disable-splash-when-unable-to-switch-vts.patch s2disk-do-not-fail-without-local-terminals.patch suspend-dont-exclude-s390.patch suspend-ignore-acpi-video-flags-not-available.patch whitelist_ibm_iplex_dx360_s2ram.patch Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.v9T7Ny/_old 2013-08-12 16:15:56.0 +0200 +++ /var/tmp/diff_new_pack.v9T7Ny/_new 2013-08-12 16:15:56.0 +0200 @@ -60,11 +60,16 @@ Patch12:suspend-buildfixes.diff Patch13:suspend-0.80-vbetool-retry-on-errors.diff Patch16:suspend-splash-verbose-debug.diff +Patch17:suspend-dont-exclude-s390.patch +Patch18:s2disk-do-not-fail-without-local-terminals.patch +Patch19:s2disk-disable-splash-when-unable-to-switch-vts.patch #Mandriva patch to enable plymouth support (Thanks to F. Crozat) -Patch17:suspend-plymouth.patch -Patch18:s2disk-do-not-fail-hibernation-withoug-a-vt-console +Patch20:suspend-plymouth.patch +Patch21:suspend-ignore-acpi-video-flags-not-available.patch +Patch22:whitelist_ibm_iplex_dx360_s2ram.patch # fix for automake-1.13.1 -Patch19:suspend-automake-1_13.diff +Patch23:suspend-automake-1_13.diff +Patch100: remove-swich-message-for-s390x.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -99,6 +104,11 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch100 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++ remove-swich-message-for-s390x.diff ++ --- a/suspend.c +++ b/suspend.c @@ -2499,8 +2499,10 @@ vt_fd = prepare_console(orig_vc, suspend_vc); if (vt_fd 0) { if (vt_fd ==
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2013-03-03 21:09:02 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is tr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2013-02-26 15:25:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2013-03-03 21:09:04.0 +0100 @@ -1,0 +2,5 @@ +Sat Mar 2 11:20:24 UTC 2013 - seife+...@b1-systems.com + +- add suspend-automake-1_13.diff, fix build with automake-1.13.1 + +--- New: suspend-automake-1_13.diff Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.un4RPy/_old 2013-03-03 21:09:05.0 +0100 +++ /var/tmp/diff_new_pack.un4RPy/_new 2013-03-03 21:09:05.0 +0100 @@ -2,6 +2,7 @@ # spec file for package suspend # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 B1 Systems GmbH, Vohburg, Germany # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,6 +63,8 @@ #Mandriva patch to enable plymouth support (Thanks to F. Crozat) Patch17:suspend-plymouth.patch Patch18:s2disk-do-not-fail-hibernation-withoug-a-vt-console +# fix for automake-1.13.1 +Patch19:suspend-automake-1_13.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -95,6 +98,7 @@ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++ suspend-automake-1_13.diff ++ Index: b/configure.ac === --- a/configure.ac +++ b/configure.ac @@ -7,11 +7,11 @@ # AC_PREREQ([2.59]) AC_INIT([suspend-utils], [1.0]) AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([suspend.c]) AC_CANONICAL_HOST AC_ARG_ENABLE( -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2013-02-26 15:25:05 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is tr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-09-23 17:31:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2013-02-26 15:25:07.0 +0100 @@ -1,0 +2,5 @@ +Mon Feb 25 22:36:11 UTC 2013 - jsl...@suse.com + +- fix path to resume, it's in /usr/sbin (bnc#802882) + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.kHavcY/_old 2013-02-26 15:25:09.0 +0100 +++ /var/tmp/diff_new_pack.kHavcY/_new 2013-02-26 15:25:09.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# 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 ++ mkinitrd-boot.kernel.sh ++ --- /var/tmp/diff_new_pack.kHavcY/_old 2013-02-26 15:25:09.0 +0100 +++ /var/tmp/diff_new_pack.kHavcY/_new 2013-02-26 15:25:09.0 +0100 @@ -21,7 +21,7 @@ # Verify manual resume mode if [ $resume_mode != off -a -n $resumedev ]; then -if [ -x /sbin/resume -o -w /sys/power/resume ]; then +if [ -x /usr/sbin/resume -o -w /sys/power/resume ]; then echo Trying manual resume from $resumedev resume_mode=1 else ++ mkinitrd-boot.userspace.sh ++ --- /var/tmp/diff_new_pack.kHavcY/_old 2013-02-26 15:25:09.0 +0100 +++ /var/tmp/diff_new_pack.kHavcY/_new 2013-02-26 15:25:09.0 +0100 @@ -5,7 +5,7 @@ #%depends: dump # #%if: -x /usr/sbin/resume -o -x /sbin/resume -#%programs: /sbin/resume +#%programs: /usr/sbin/resume # # software suspend resume ## @@ -24,7 +24,7 @@ # Verify manual resume mode if [ $resume_mode != off -a -n $resumedev ]; then -if [ -x /sbin/resume -o -w /sys/power/resume ]; then +if [ -x /usr/sbin/resume -o -w /sys/power/resume ]; then echo Trying manual resume from $resumedev resume_mode=1 else @@ -43,16 +43,16 @@ fi # Waits for the resume device to appear if [ $resume_mode != off ]; then - if [ -x /sbin/resume ]; then + if [ -x /usr/sbin/resume ]; then echo Invoking userspace resume from $resumedev [ -f /proc/splash ] read procsplash /proc/splash case $procsplash in *silent*) # if the version of resume is not new enough, -P will fail. - /sbin/resume -P 'splash = y' $resumedev || /sbin/resume $resumedev + /usr/sbin/resume -P 'splash = y' $resumedev || /usr/sbin/resume $resumedev ;; *) - /sbin/resume -P 'splash = n' $resumedev || /sbin/resume $resumedev + /usr/sbin/resume -P 'splash = n' $resumedev || /usr/sbin/resume $resumedev ;; esac fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-09-23 17:31:26 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-09-14 12:39:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-09-23 17:31:28.0 +0200 @@ -1,0 +2,6 @@ +Tue Sep 18 16:26:27 UTC 2012 - fcro...@suse.com + +- Correctly handle plymouth not being installed in plymouth patch + (bnc#779399). + +--- Other differences: -- ++ suspend-plymouth.patch ++ --- /var/tmp/diff_new_pack.Kd86lC/_old 2012-09-23 17:31:29.0 +0200 +++ /var/tmp/diff_new_pack.Kd86lC/_new 2012-09-23 17:31:29.0 +0200 @@ -1,7 +1,8 @@ -diff -urNB suspend-utils-1.0/configure.ac new/configure.ac suspend-utils-1.0/configure.ac 2011-03-07 00:24:15.0 +0100 -+++ new/configure.ac 2012-02-16 16:47:16.909290161 +0100 -@@ -74,6 +74,12 @@ +Index: suspend-utils-1.0/configure.ac +=== +--- suspend-utils-1.0.orig/configure.ac suspend-utils-1.0/configure.ac +@@ -74,6 +74,12 @@ AC_ARG_ENABLE( , [enable_fbsplash=no] ) @@ -14,7 +15,7 @@ AC_ARG_WITH( [devdir], [AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, put devices in this directory, default /dev])], -@@ -249,6 +255,21 @@ +@@ -249,6 +255,21 @@ if test ${enable_fbsplash} = yes; th ) fi @@ -36,7 +37,7 @@ if test ${enable_threads} = yes; then CONFIG_FEATURES=${CONFIG_FEATURES} threads AC_DEFINE([CONFIG_THREADS], [1], [Define if threads enabled]) -@@ -301,6 +322,7 @@ +@@ -301,6 +322,7 @@ AM_CONDITIONAL([ENABLE_RESUME_STATIC], [ AM_CONDITIONAL([ENABLE_CREATE_DEVICE], [test ${enable_create_device} = yes]) AM_CONDITIONAL([ENABLE_SPLASHY], [test ${enable_splashy} = yes]) AM_CONDITIONAL([ENABLE_FBSPLASH], [test ${enable_fbsplash} = yes]) @@ -44,10 +45,11 @@ AC_CONFIG_FILES([ Makefile doc/Makefile -diff -urNB suspend-utils-1.0/Makefile.am new/Makefile.am suspend-utils-1.0/Makefile.am 2011-03-07 00:24:15.0 +0100 -+++ new/Makefile.am2012-02-16 16:47:16.909290161 +0100 -@@ -29,6 +29,9 @@ +Index: suspend-utils-1.0/Makefile.am +=== +--- suspend-utils-1.0.orig/Makefile.am suspend-utils-1.0/Makefile.am +@@ -29,6 +29,9 @@ if ENABLE_DEBUG if ENABLE_FBSPLASH noinst_PROGRAMS+=fbsplash-test endif @@ -57,7 +59,7 @@ endif noinst_LIBRARIES=\ libsuspend-common.a -@@ -88,6 +91,12 @@ +@@ -88,6 +91,12 @@ AM_CFLAGS+=\ common_s2disk_libs+=\ ${FBSPLASH_LIBS} endif @@ -70,7 +72,7 @@ libsuspend_common_a_SOURCES=\ swsusp.h suspend_ioctls.h \ -@@ -99,6 +108,7 @@ +@@ -99,6 +108,7 @@ libsuspend_common_a_SOURCES=\ splash.h splash.c \ splashy_funcs.h splashy_funcs.c \ fbsplash_funcs.h fbsplash_funcs.c \ @@ -78,7 +80,7 @@ bootsplash.h bootsplash.c \ memalloc.h memalloc.c load.c \ whitelist.h whitelist.csv whitelist.c \ -@@ -179,6 +189,11 @@ +@@ -179,6 +189,11 @@ whitelist.c: whitelist.csv clean-local: rm -f whitelist.c @@ -90,10 +92,11 @@ # # Misc functions # -diff -urNB suspend-utils-1.0/plymouth_funcs.c new/plymouth_funcs.c suspend-utils-1.0/plymouth_funcs.c 1970-01-01 01:00:00.0 +0100 -+++ new/plymouth_funcs.c 2012-02-16 17:18:06.983379699 +0100 -@@ -0,0 +1,258 @@ +Index: suspend-utils-1.0/plymouth_funcs.c +=== +--- /dev/null suspend-utils-1.0/plymouth_funcs.c +@@ -0,0 +1,259 @@ +/* + * plymouth_funcs.c + * @@ -156,7 +159,8 @@ + int fd = open(/dev/null, O_RDWR); + dup2(fd, 2); + close(fd); -+ execl(cmd, cmd, arg, (char *) NULL); ++ if (execl(cmd, cmd, arg, (char *) NULL) == -1) ++ exit(1); + } + else { + int status; @@ -352,9 +356,10 @@ + + +#endif -diff -urNB suspend-utils-1.0/plymouth_funcs.h new/plymouth_funcs.h suspend-utils-1.0/plymouth_funcs.h 1970-01-01 01:00:00.0 +0100 -+++ new/plymouth_funcs.h 2012-02-16 17:18:15.332380115 +0100 +Index: suspend-utils-1.0/plymouth_funcs.h +=== +--- /dev/null suspend-utils-1.0/plymouth_funcs.h @@ -0,0 +1,28 @@ +/* + * plymouth_funcs.h @@ -384,9
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-09-14 12:39:23 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-05-31 17:10:46.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-09-14 12:39:34.0 +0200 @@ -1,0 +2,6 @@ +Fri Aug 17 17:14:42 CEST 2012 - hma...@suse.de + +- vbetool.c is GPL-2.0 and compiled into the resume binary. So + the spec file needs to be GPL-2.0 only (bnc#776145) + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.nGTnZH/_old 2012-09-14 12:39:35.0 +0200 +++ /var/tmp/diff_new_pack.nGTnZH/_new 2012-09-14 12:39:35.0 +0200 @@ -40,7 +40,7 @@ Version:1.0 Release:0 Summary:A Set Of Tools To Support Sleep Modes -License:GPL-2.0+ +License:GPL-2.0 Group: System/Console Url:http://sourceforge.net/projects/suspend Source: %name-utils-%{version}.tar.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-05-31 17:10:44 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-05-10 14:34:50.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-05-31 17:10:46.0 +0200 @@ -1,0 +2,6 @@ +Mon May 21 11:36:07 UTC 2012 - badshah...@gmail.com + +- Use BuildRequires: libgnutls-devel instead of gnutls-devel for + Factory in keeping with gnutls package naming changes. + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.pZ3z09/_old 2012-05-31 17:10:48.0 +0200 +++ /var/tmp/diff_new_pack.pZ3z09/_new 2012-05-31 17:10:48.0 +0200 @@ -18,7 +18,11 @@ Name: suspend BuildRequires: glib2-devel +%if 0%{?suse_version} 1210 +BuildRequires: libgnutls-devel +%else BuildRequires: gnutls-devel +%endif BuildRequires: libgcrypt-devel BuildRequires: libtool BuildRequires: pciutils-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-05-10 14:34:23 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-05-07 22:52:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-05-10 14:34:50.0 +0200 @@ -1,0 +2,5 @@ +Tue May 8 03:52:23 UTC 2012 - je...@suse.com + +- s2disk: Do not fail hibernation withoug a VT console (bnc#472861). + +--- New: s2disk-do-not-fail-hibernation-withoug-a-vt-console Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.kuNkqL/_old 2012-05-10 14:34:52.0 +0200 +++ /var/tmp/diff_new_pack.kuNkqL/_new 2012-05-10 14:34:52.0 +0200 @@ -57,6 +57,7 @@ Patch16:suspend-splash-verbose-debug.diff #Mandriva patch to enable plymouth support (Thanks to F. Crozat) Patch17:suspend-plymouth.patch +Patch18:s2disk-do-not-fail-hibernation-withoug-a-vt-console BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -89,6 +90,7 @@ %patch13 -p0 %patch16 -p1 %patch17 -p1 +%patch18 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++ s2disk-do-not-fail-hibernation-withoug-a-vt-console ++ From: Rafael J. Wysocki r...@sisk.pl Subject: s2disk: Do not fail hibernation withoug a VT console Currently, s2disk fails to hibernate if there is no VT console available to it, because it can't switch to a different VT in that case. However, switching VTs is not really essential and it should be safe to carry out hibernation using the current console for diagnostics. For this reason, modify s2disk to prevent it from failing when it can't use a VT console. Signed-off-by: Rafael J. Wysocki r...@sisk.pl Acked-by: Jeff Mahoney je...@suse.com --- suspend.c | 38 ++ 1 file changed, 26 insertions(+), 12 deletions(-) Index: suspend-utils/suspend.c === --- suspend-utils.orig/suspend.c +++ suspend-utils/suspend.c @@ -57,6 +57,15 @@ do { \ fprintf(stderr, %s: msg Reason: %m\n, my_name, ## args); \ } while (0) +#ifdef CONFIG_ARCH_S390 +#define suspend_warning(msg) +#else +#define suspend_warning(msg) \ +do { \ + fprintf(stderr, %s: msg \n, my_name); \ +} while (0) +#endif + static char snapshot_dev_name[MAX_STR_LEN] = SNAPSHOT_DEVICE; static char resume_dev_name[MAX_STR_LEN] = RESUME_DEVICE; static loff_t resume_offset; @@ -2480,21 +2489,24 @@ int main(int argc, char *argv[]) vt_fd = prepare_console(orig_vc, suspend_vc); if (vt_fd 0) { - ret = errno; - if (vt_fd == -ENOTTY) - suspend_error(No local tty. Remember to specify local \ - console after the remote.); - else + if (vt_fd == -ENOTTY) { + suspend_warning(Unable to switch virtual terminals, + using the current console.); + } else { suspend_error(Could not open a virtual terminal.); - goto Close_snapshot_fd; + ret = errno; + goto Close_snapshot_fd; + } } splash_prepare(splash, splash_param); - if (lock_vt() 0) { - ret = errno; - suspend_error(Could not lock the terminal.); - goto Restore_console; + if (vt_fd = 0) { + if (lock_vt() 0) { + ret = errno; + suspend_error(Could not lock the terminal.); + goto Restore_console; + } } splash.progress(5); @@ -2538,10 +2550,12 @@ int main(int argc, char *argv[]) set_swappiness(orig_swappiness); close_swappiness(); - unlock_vt(); + if (vt_fd = 0) + unlock_vt(); Restore_console: splash.finish(); - restore_console(vt_fd, orig_vc); + if (vt_fd = 0) + restore_console(vt_fd, orig_vc); Close_snapshot_fd: close(snapshot_fd); Close_resume_fd: -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-05-07 22:52:46 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2012-04-23 16:13:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-05-07 22:52:47.0 +0200 @@ -1,0 +2,5 @@ +Sat Apr 28 15:56:49 UTC 2012 - seife+...@b1-systems.com + +- fix build by creating /etc in DESTDIR before make install + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.WQkq4F/_old 2012-05-07 22:52:49.0 +0200 +++ /var/tmp/diff_new_pack.WQkq4F/_new 2012-05-07 22:52:49.0 +0200 @@ -108,6 +108,7 @@ make %install +install -d $RPM_BUILD_ROOT/etc make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2012-04-23 16:13:29 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2011-11-28 12:57:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2012-04-23 16:13:47.0 +0200 @@ -1,0 +2,5 @@ +Mon Apr 2 08:35:26 UTC 2012 - tittiatc...@gmail.com + +- Added patch from Frederic Crozat to enable plymouth support + +--- New: suspend-plymouth.patch Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.9Nr4uQ/_old 2012-04-23 16:13:48.0 +0200 +++ /var/tmp/diff_new_pack.9Nr4uQ/_new 2012-04-23 16:13:48.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package suspend # -# 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,15 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: suspend -BuildRequires: glib2-devel gnutls-devel pciutils-devel pkgconfig -BuildRequires: libgcrypt-devel libtool -%if 0%{?suse_version} 1020 +BuildRequires: glib2-devel +BuildRequires: gnutls-devel +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: pciutils-devel +BuildRequires: pkgconfig +BuildRequires: plymouth-devel BuildRequires: splashy-devel -%endif %if 0%{?mandriva_version} BuildRequires: liblzo-devel %else @@ -36,8 +37,8 @@ Release:0 Summary:A Set Of Tools To Support Sleep Modes License:GPL-2.0+ -Url:http://sourceforge.net/projects/suspend Group: System/Console +Url:http://sourceforge.net/projects/suspend Source: %name-utils-%{version}.tar.bz2 Source2:configure-suspend-encryption.sh Source3:README.scripts @@ -54,6 +55,8 @@ Patch12:suspend-buildfixes.diff Patch13:suspend-0.80-vbetool-retry-on-errors.diff Patch16:suspend-splash-verbose-debug.diff +#Mandriva patch to enable plymouth support (Thanks to F. Crozat) +Patch17:suspend-plymouth.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -85,6 +88,7 @@ %patch12 -p0 %patch13 -p0 %patch16 -p1 +%patch17 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c @@ -95,26 +99,19 @@ --sysconfdir=/etc \ --with-initramfsdir=/usr/sbin \ --enable-encrypt \ -%if 0%{?suse_version} 1020 +--enable-plymouth \ --enable-splashy \ --disable-resume-static \ -%endif --enable-threads \ -%if 0%{?suse_version} 1010 --docdir=%{_docdir}/%{name} \ -%else - --datadir=/usr/share \ -%endif --enable-compress make %install make install DESTDIR=$RPM_BUILD_ROOT -%if 0%{?suse_version} 1100 install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.userspace.sh -%endif install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ touch $RPM_BUILD_ROOT/etc/suspend.key @@ -122,7 +119,6 @@ rm -rf $RPM_BUILD_ROOT %post -%if 0%{?suse_version} 1100 if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then echo Skipping recreation of existing initial ramdisks, due echo to presence of /var/lib/no_initrd_recreation_by_suspend @@ -133,7 +129,6 @@ if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi -%endif if [ $YAST_IS_RUNNING != instsys -a \ ! -e /.buildenv -a \ -x /sbin/update-bootloader -a \ @@ -141,7 +136,6 @@ /sbin/mkinitrd /sbin/update-bootloader --refresh fi -%if 0%{?suse_version} 1100 %postun if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then @@ -152,17 +146,14 @@ if [ -x /sbin/mkinitrd_setup ] ; then mkinitrd_setup fi -%endif %files %defattr (-,root,root) %config /etc/suspend.conf -%if 0%{?suse_version} 1100 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-resume.kernel.sh /lib/mkinitrd/scripts/boot-resume.userspace.sh -%endif %ghost %config(noreplace) /etc/suspend.key /usr/sbin/s2disk /usr/sbin/s2ram @@ -172,8 +163,5 @@ /usr/sbin/swap-offset /usr/sbin/configure-suspend-encryption.sh %doc README
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2011-12-06 19:06:34 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.GI7Rmk/_old 2011-12-06 19:40:26.0 +0100 +++ /var/tmp/diff_new_pack.GI7Rmk/_new 2011-12-06 19:40:26.0 +0100 @@ -35,7 +35,7 @@ Version:1.0 Release:0 Summary:A Set Of Tools To Support Sleep Modes -License:GPLv2+ +License:GPL-2.0+ Url:http://sourceforge.net/projects/suspend Group: System/Console Source: %name-utils-%{version}.tar.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2011-11-28 12:57:56 Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) Package is suspend, Maintainer is hma...@suse.com Changes: --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2011-09-23 12:47:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2011-11-28 12:57:58.0 +0100 @@ -1,0 +2,5 @@ +Sun Nov 27 06:49:53 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.9iZspf/_old 2011-11-28 12:58:00.0 +0100 +++ /var/tmp/diff_new_pack.9iZspf/_new 2011-11-28 12:58:00.0 +0100 @@ -20,7 +20,7 @@ Name: suspend BuildRequires: glib2-devel gnutls-devel pciutils-devel pkgconfig -BuildRequires: libgcrypt-devel +BuildRequires: libgcrypt-devel libtool %if 0%{?suse_version} 1020 BuildRequires: splashy-devel %endif @@ -33,7 +33,7 @@ BuildRequires: libx86-devel %endif Version:1.0 -Release:8 +Release:0 Summary:A Set Of Tools To Support Sleep Modes License:GPLv2+ Url:http://sourceforge.net/projects/suspend -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit suspend for openSUSE:Factory
Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at Wed Aug 24 16:17:48 CEST 2011. --- suspend/suspend.changes 2011-05-24 10:41:59.0 +0200 +++ /mounts/work_src_done/STABLE/suspend/suspend.changes2011-08-19 06:58:22.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 19 04:58:02 UTC 2011 - crrodrig...@opensuse.org + +- Fix build with new gnutls + +--- calling whatdependson for head-i586 Other differences: -- ++ suspend.spec ++ --- /var/tmp/diff_new_pack.U4dCw1/_old 2011-08-24 16:17:12.0 +0200 +++ /var/tmp/diff_new_pack.U4dCw1/_new 2011-08-24 16:17:12.0 +0200 @@ -20,6 +20,7 @@ Name: suspend BuildRequires: glib2-devel gnutls-devel pciutils-devel pkgconfig +BuildRequires: libgcrypt-devel %if 0%{?suse_version} 1020 BuildRequires: splashy-devel %endif @@ -32,7 +33,7 @@ BuildRequires: libx86-devel %endif Version:1.0 -Release:1 +Release:8 Summary:A Set Of Tools To Support Sleep Modes License:GPLv2+ Url:http://sourceforge.net/projects/suspend Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org