Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at Tue May 31 16:37:35 CEST 2011.
-------- --- suspend/suspend.changes 2010-08-02 13:12:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/suspend/suspend.changes 2011-05-24 10:41:59.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 18 13:11:24 CEST 2011 - [email protected] + +- update to 1.0 +- remove suspend-0.80-opensuse.org.diff +- remove suspend-0.80-fix-s2both-resume-hacks.diff +- refresh patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- suspend-0.8.20100129.tar.bz2 suspend-0.80-fix-s2both-resume-hacks.diff suspend-0.80-opensuse.org.diff New: ---- suspend-utils-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package suspend (Version 0.80.20100129) +# spec file for package suspend # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -31,15 +31,13 @@ %ifarch %ix86 x86_64 BuildRequires: libx86-devel %endif -%define GITDATE 20100129 -Version: 0.80.%{GITDATE} -Release: 6 -%define tarversion 0.8.%{GITDATE} +Version: 1.0 +Release: 1 Summary: A Set Of Tools To Support Sleep Modes License: GPLv2+ Url: http://sourceforge.net/projects/suspend Group: System/Console -Source: %name-%{tarversion}.tar.bz2 +Source: %name-utils-%{version}.tar.bz2 Source2: configure-suspend-encryption.sh Source3: README.scripts Source4: mkinitrd-boot.kernel.sh @@ -50,13 +48,11 @@ Patch4: suspend-disable-bootsplash.diff Patch5: suspend-default-splash.diff Patch6: suspend-0.80-dont-return-eintr-on-abort.diff -Patch7: suspend-0.80-fix-s2both-resume-hacks.diff Patch10: suspend-0.80-keygen-new-defaults.diff Patch11: suspend-0.80-make-whitelist-test.diff Patch12: suspend-buildfixes.diff Patch13: suspend-0.80-vbetool-retry-on-errors.diff Patch16: suspend-splash-verbose-debug.diff -Patch99: suspend-0.80-opensuse.org.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -76,20 +72,18 @@ and others. %prep -%setup -q -n suspend-%{tarversion} +%setup -q -n suspend-utils-%{version} %patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 %patch5 -p0 %patch6 -p1 -%patch7 -p1 %patch10 -p1 %patch11 -p0 %patch12 -p0 %patch13 -p0 %patch16 -p1 -%patch99 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++++++ suspend-0.80-dont-return-eintr-on-abort.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,8 +1,8 @@ -Index: b/suspend.c +Index: suspend-utils-1.0/suspend.c =================================================================== ---- a/suspend.c -+++ b/suspend.c -@@ -1261,6 +1261,11 @@ Shutdown: +--- suspend-utils-1.0.orig/suspend.c ++++ suspend-utils-1.0/suspend.c +@@ -1794,6 +1794,11 @@ Shutdown: Unfreeze: unfreeze(snapshot_fd); ++++++ suspend-0.80-make-whitelist-test.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,11 +1,8 @@ Index: Makefile.am =================================================================== -RCS file: /cvsroot/suspend/suspend/Makefile.am,v -retrieving revision 1.6 -diff -u -p -r1.6 Makefile.am ---- Makefile.am 16 Apr 2008 15:27:36 -0000 1.6 -+++ Makefile.am 16 Apr 2008 16:43:25 -0000 -@@ -176,3 +176,9 @@ install-resume-new-initrd: resume +--- Makefile.am.orig ++++ Makefile.am +@@ -192,3 +192,9 @@ install-resume-new-initrd: resume install-resume-on-initrd: resume BOOT_DIR=$(DESTDIR)$(bootdir) ./scripts/install-resume.sh ++++++ suspend-0.80-vbetool-retry-on-errors.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- s2ram-x86.c.orig +++ s2ram-x86.c -@@ -321,6 +321,7 @@ int s2ram_do(void) +@@ -319,6 +319,7 @@ int s2ram_do(void) void s2ram_resume(void) { @@ -10,7 +10,7 @@ if (flags & PCI_SAVE) { printf("restoring PCI config of device %02x:%02x.%d\n", vga_dev.bus, vga_dev.dev, vga_dev.func); -@@ -330,19 +331,36 @@ void s2ram_resume(void) +@@ -328,19 +329,36 @@ void s2ram_resume(void) } // FIXME: can we call vbetool_init() multiple times without cleaning up? if (flags & VBE_POST) { ++++++ suspend-buildfixes.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.am.orig +++ Makefile.am -@@ -77,7 +77,7 @@ common_s2ram_libs= +@@ -78,7 +78,7 @@ common_s2ram_libs= if ENABLE_SPLASHY AM_CFLAGS+=\ @@ -15,7 +15,7 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -260,7 +260,7 @@ fi +@@ -281,7 +281,7 @@ fi # workaround for old autoconf if test -z "${docdir}"; then ++++++ suspend-default-compress.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- suspend.c.orig +++ suspend.c -@@ -1768,13 +1768,15 @@ int main(int argc, char *argv[]) +@@ -2295,13 +2295,15 @@ int main(int argc, char *argv[]) if (compute_checksum != 'y' && compute_checksum != 'Y') compute_checksum = 0; #ifdef CONFIG_COMPRESS ++++++ suspend-default-splash.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- resume.c.orig +++ resume.c -@@ -421,10 +421,10 @@ int main(int argc, char *argv[]) +@@ -432,10 +432,10 @@ int main(int argc, char *argv[]) if (error) return -error; @@ -20,7 +20,7 @@ =================================================================== --- suspend.c.orig +++ suspend.c -@@ -1782,10 +1782,10 @@ int main(int argc, char *argv[]) +@@ -2309,10 +2309,10 @@ int main(int argc, char *argv[]) if (do_encrypt != 'y' && do_encrypt != 'Y') do_encrypt = 0; #endif ++++++ suspend-disable-bootsplash.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,6 +1,8 @@ ---- splash.c +Index: splash.c +=================================================================== +--- splash.c.orig +++ splash.c -@@ -85,7 +85,7 @@ +@@ -207,7 +207,7 @@ void splash_prepare(struct splash *splas printf("Looking for splash system... "); ++++++ suspend-splash-verbose-debug.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,8 +1,8 @@ -Index: b/resume.c +Index: suspend-utils-1.0/resume.c =================================================================== ---- a/resume.c -+++ b/resume.c -@@ -201,6 +201,13 @@ static void pause_resume(int pause) +--- suspend-utils-1.0.orig/resume.c ++++ suspend-utils-1.0/resume.c +@@ -213,6 +213,13 @@ static void pause_resume(int pause) splash.set_caption(message); printf("%s: %s", my_name, message); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
