[packages/suspend-utils] - rel 2; make default config with comments only

[arekm]

commit ff75de6e670e72695d8e3714f8f5cf2d152fbc14
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jul 2 22:16:44 2013 +0200

    - rel 2; make default config with comments only

 suspend-utils-build.patch | 36 ++++++++++++++++++++++++++++++++++++
 suspend-utils-conf.patch  | 11 +++++++++++
 suspend-utils.spec        | 10 +++++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/suspend-utils.spec b/suspend-utils.spec
index 827cf3a..21489d1 100644
--- a/suspend-utils.spec
+++ b/suspend-utils.spec
@@ -14,7 +14,7 @@ Summary(de.UTF-8):	Einfrieren in den Systemspeicher
 Summary(pl.UTF-8):	Zamrażanie w RAM/na dysku/jedno i drugie
 Name:		suspend-utils
 Version:	1.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 # git clone git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-utils.git
@@ -25,6 +25,8 @@ Source1:	wlcsv2c.pl
 Patch0:		suspend-sys-file-range-write.patch
 Patch1:		suspend-fadvise.patch
 Patch2:		suspend-diet.patch
+Patch3:		suspend-utils-conf.patch
+Patch4:		suspend-utils-build.patch
 URL:		http://sourceforge.net/projects/suspend
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -40,6 +42,7 @@ BuildRequires:	lzo-static >= 2.02
 BuildRequires:	libx86-static
 %endif
 BuildRequires:	pciutils-devel
+BuildRequires:	perl-Switch
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 %if %{with splashy}
@@ -88,6 +91,8 @@ Zamrażanie w RAM/Dysku/Jedno i drugie - program resume dla initrd.
 %patch0 -p1
 %patch1 -p2
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 install %{SOURCE1} .
 
@@ -146,6 +151,9 @@ mv resume resume-initrd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/etc
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/suspend-utils-build.patch b/suspend-utils-build.patch
new file mode 100644
index 0000000..f9469b1
--- /dev/null
+++ b/suspend-utils-build.patch
@@ -0,0 +1,36 @@
+diff -urN suspend-utils-1.0.g668c5f7.org/configure.ac suspend-utils-1.0.g668c5f7/configure.ac
+--- suspend-utils-1.0.g668c5f7.org/configure.ac	2012-09-15 22:23:44.000000000 +0200
++++ suspend-utils-1.0.g668c5f7/configure.ac	2013-07-02 22:05:30.884207944 +0200
+@@ -9,7 +9,7 @@
+ 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_CONFIG_MACRO_DIR([m4])
+ 
+diff -urN suspend-utils-1.0.org/bootsplash.c suspend-utils-1.0/bootsplash.c
+--- suspend-utils-1.0.org/bootsplash.c	2011-03-07 00:24:15.000000000 +0100
++++ suspend-utils-1.0/bootsplash.c	2013-07-02 22:14:48.196673333 +0200
+@@ -118,7 +118,7 @@
+ {
+ 	int ret;
+ 	bootsplash_to_verbose();
+-	printf(prompt);
++	printf("%s", prompt);
+ 	ret = getchar();
+ 	bootsplash_to_silent();
+ 
+diff -urN suspend-utils-1.0.org/splash.c suspend-utils-1.0/splash.c
+--- suspend-utils-1.0.org/splash.c	2011-03-07 00:24:15.000000000 +0100
++++ suspend-utils-1.0/splash.c	2013-07-02 22:14:40.543075949 +0200
+@@ -53,7 +53,7 @@
+ 
+ static int splash_dialog(const char *prompt) 
+ {
+-	printf(prompt);
++	printf("%s", prompt);
+ 	return getchar();
+ }
+ 
diff --git a/suspend-utils-conf.patch b/suspend-utils-conf.patch
new file mode 100644
index 0000000..b5d97f0
--- /dev/null
+++ b/suspend-utils-conf.patch
@@ -0,0 +1,11 @@
+diff -urN suspend-utils-1.0.g668c5f7.org/conf/suspend.conf suspend-utils-1.0.g668c5f7/conf/suspend.conf
+--- suspend-utils-1.0.g668c5f7.org/conf/suspend.conf	2012-09-15 22:23:44.000000000 +0200
++++ suspend-utils-1.0.g668c5f7/conf/suspend.conf	2013-07-02 22:01:04.681619040 +0200
+@@ -1,5 +1,5 @@
+-snapshot device = /dev/snapshot
+-resume device = <path_to_resume_device_file>
++#snapshot device = /dev/snapshot
++#resume device = <path_to_resume_device_file>
+ #image size = 350000000
+ #suspend loglevel = 2
+ #compute checksum = y
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/suspend-utils.git/commitdiff/ff75de6e670e72695d8e3714f8f5cf2d152fbc14