From 73c798c64258628fa2749caf4d7dbe70fdcaaaa68c4aa9ffead0a8c326900581 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Wed, 12 May 2010 15:42:58 +0000
Subject: [PATCH] - Apply sysvinit-2.88dsf-utf8.dif without -p2. - Fix
 sysvinit-2.88dsf-utf8.dif (Changelog patch didn't apply).

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=47
---
 sysvinit-2.88dsf-utf8.dif | 27 ++++++++++++++-------------
 sysvinit.changes          |  6 ++++++
 sysvinit.spec             |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/sysvinit-2.88dsf-utf8.dif b/sysvinit-2.88dsf-utf8.dif
index 0fa6cdb..9cc0e94 100644
--- a/sysvinit-2.88dsf-utf8.dif
+++ b/sysvinit-2.88dsf-utf8.dif
@@ -1,20 +1,21 @@
 Index: doc/Changelog
 ===================================================================
---- doc/Changelog	(revision 68)
-+++ doc/Changelog	(working copy)
-@@ -1,3 +1,7 @@
-+  [ Werner Fink ]
+--- doc/Changelog.orig	2010-04-11 11:30:27.000000000 +0200
++++ doc/Changelog	2010-05-12 13:26:34.679992111 +0200
+@@ -35,6 +35,8 @@ sysvinit (2.88dsf) world; urgency=low
+     get binaries with debug information installed.
+ 
+   [ Werner Fink ]
 +  * Correct fix for Debian bug #547073: use IUTF8 flag if defined
 +    and if already set.
-+
- sysvinit (2.88dsf) UNRELEASED; urgency=low
- 
-   [ Petter Reinholdtsen ]
+   * Add the comment from Andrea Arcangeli about the correct
+     place of setting the default childhandler within spawn().
+   * Make sure that newline is printed out for last(1) even
 Index: src/init.c
 ===================================================================
---- src/init.c	(revision 68)
-+++ src/init.c	(working copy)
-@@ -784,10 +784,11 @@ void console_stty(void)
+--- src/init.c.orig	2010-05-12 13:24:29.000000000 +0200
++++ src/init.c	2010-05-12 13:24:44.536090878 +0200
+@@ -788,10 +788,11 @@ void console_stty(void)
  	/*
  	 *	Set pre and post processing
  	 */
@@ -31,8 +32,8 @@ Index: src/init.c
  
 Index: src/sulogin.c
 ===================================================================
---- src/sulogin.c	(revision 68)
-+++ src/sulogin.c	(working copy)
+--- src/sulogin.c.orig	2010-04-08 11:07:36.000000000 +0200
++++ src/sulogin.c	2010-05-12 13:24:44.576090860 +0200
 @@ -101,9 +101,6 @@ void fixtty(void)
  	 * the same result as `stty sane cr0 pass8'
  	 */
diff --git a/sysvinit.changes b/sysvinit.changes
index 171d88e..7e09bbd 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 12 11:28:31 UTC 2010 - pth@ssue.de
+
+- Apply sysvinit-2.88dsf-utf8.dif without -p2.
+- Fix sysvinit-2.88dsf-utf8.dif (Changelog patch didn't apply).
+
 -------------------------------------------------------------------
 Thu Apr 29 13:00:25 CEST 2010 - werner@suse.de
 
diff --git a/sysvinit.spec b/sysvinit.spec
index 89c41e0..e2e94b5 100644
--- a/sysvinit.spec
+++ b/sysvinit.spec
@@ -91,7 +91,7 @@ sysvinit package.
 %patch3  -p0 -b .no-kill
 %patch4  -p0 -b .pam
 %patch5  -p2 -b .ipv6
-%patch6  -p2 -b .utf8
+%patch6  -b .utf8
 %patch
 pushd ../powerd-%{PDVER}
 %patch20