[plymouth/f17] fix serial console parsing

[Ray Strode]

commit cf546a374d8f0e76fa1a27394ba0cf757b66fc0a
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Apr 4 11:46:30 2012 -0400

    fix serial console parsing

 fix-serial-consoles.patch |   30 ++++++++++++++++++++++++++++++
 plymouth.spec             |    7 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/fix-serial-consoles.patch b/fix-serial-consoles.patch
new file mode 100644
index 0000000..da5533c
--- /dev/null
+++ b/fix-serial-consoles.patch
@@ -0,0 +1,30 @@
+From 032a30c489ad658bd03b4145806da2f989db2c7e Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at mageia.org>
+Date: Thu, 15 Dec 2011 10:35:07 +0000
+Subject: [PATCH] main: Also show splash for 'splash=silent' arguments (which
+ is what we use in Mageia)
+
+---
+ src/main.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 9565a3e..e4223b7 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -755,6 +755,12 @@ plymouth_should_show_default_splash (state_t *state)
+       return true;
+     }
+ 
++  if (command_line_has_argument (state->kernel_command_line, "splash=silent"))
++    {
++      ply_trace ("using default splash because kernel command line has option \"splash=slient\"");
++      return true;
++    }
++
+   ply_trace ("no default splash because kernel command line lacks \"splash\" or \"rhgb\"");
+   return false;
+ }
+-- 
+1.7.9.3
+
diff --git a/plymouth.spec b/plymouth.spec
index df8fdaa..c218cb0 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
 Source4: plymouth-update-initrd
+Patch0: fix-serial-consoles.patch
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -238,6 +239,7 @@ Plymouth. It features a small spinner on a dark background.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-serial-consoles
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -496,6 +498,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Apr 04 2012 Ray Strode <rstrode at redhat.com> 0.8.4-2
+- Fix problem with serial console parsing
+
 * Tue Mar 27 2012 Ray Strode <rstrode at redhat.com> 0.8.4-1
 - Update to 0.8.4
 - drop some compat goo