[plymouth/f18] Ensure fedup gets right splash screen

[Ray Strode]

commit 18b4655ef8e07f7579d44f474365aacd7cac614d
Author: Ray Strode <rstrode at redhat.com>
Date:   Thu Dec 13 13:20:43 2012 -0500

    Ensure fedup gets right splash screen
    
    Related: #879295

 fix-fed-up.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 plymouth.spec    |    8 +++++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/fix-fed-up.patch b/fix-fed-up.patch
new file mode 100644
index 0000000..3c09c98
--- /dev/null
+++ b/fix-fed-up.patch
@@ -0,0 +1,45 @@
+From a9703fb6e3112bbf63ae0f1b0d4d1b5c55befd32 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods at redhat.com>
+Date: Thu, 29 Nov 2012 10:25:03 -0500
+Subject: [PATCH] populate-initrd: If PLYMOUTH_THEME_NAME is set, write it
+ into plymouthd.conf
+
+You can set PLYMOUTH_THEME_NAME when building initramfs to get a
+different theme into initramfs, but this doesn't change the default
+theme, so the resulting initramfs won't actually use the theme we
+installed.
+
+This patch makes plymouth-populate-initrd rewrite the 'Theme=XXX' line
+in plymouthd.conf, so plymouth will use the theme we install.
+---
+ scripts/plymouth-populate-initrd.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
+index 8d1eec0..d901a9b 100755
+--- a/scripts/plymouth-populate-initrd.in
++++ b/scripts/plymouth-populate-initrd.in
+@@ -8,6 +8,7 @@
+ [ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
+ [ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+ [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@"
++[ -n "$PLYMOUTH_THEME_NAME" ] && THEME_OVERRIDE=1
+ [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
+ [ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
+ [ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
+@@ -388,6 +389,12 @@ if [ -z "$PLYMOUTH_THEME_NAME" ]; then
+     exit 1
+ fi
+ 
++if [ $THEME_OVERRIDE ]; then
++    conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf
++    echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr
++    sed -i "s/^ *Theme *=.*/# theme modified by plymouth-populate-initrd\nTheme=$PLYMOUTH_THEME_NAME/" $conf
++fi
++
+ PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
+ 
+ if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
+-- 
+1.7.11.7
+
diff --git a/plymouth.spec b/plymouth.spec
index bc0f1dd..600f3e7 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Obsoletes: plymouth-gdm-hooks < 0.8.4-0.20101119.4
 Obsoletes: plymouth-utils < 0.8.4-0.20101119.4
 
 Patch0: fix-crash.patch
+Patch1: fix-fed-up.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -241,6 +242,7 @@ Plymouth. It features a small spinner on a dark background.
 %prep
 %setup -q
 %patch0 -p1 -b .fix-crash
+%patch1 -p1 -b .fix-fed-up
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -497,6 +499,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Dec 13 2012 Ray Strode <rstrode at redhat.com> 0.8.8-5
+- Ensure fedup gets right splash screen
+  Related: #879295
+
 * Thu Nov 15 2012 Ray Strode <rstrode at redhat.com> 0.8.8-4
 - Drop set-default-plugin compat script
 - Just use upstream update-initrd