From 624cca758514a985260ec2ac69a35c02a18c0dc88e9322df7873a43b26fd567e Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Mon, 4 Jun 2012 18:36:53 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=46

---
 plymouth.changes |  7 +++++++
 plymouth.spec    | 18 +-----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/plymouth.changes b/plymouth.changes
index 5d1826a..033cefd 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  4 18:34:08 UTC 2012 - tittiatcoke@gmail.com
+
+- Ensure that the openSUSE theme is default. 
+- Remove unnecessary changes to the kernel options. Plymouth also
+  accepts splash=silent.
+
 -------------------------------------------------------------------
 Wed May 30 16:41:02 UTC 2012 - vuntz@opensuse.org
 
diff --git a/plymouth.spec b/plymouth.spec
index e47068b..f537edf 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -324,7 +324,7 @@ plugin.
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
 
 # Change the default theme
-sed -i -e 's/fade-in/solar/g' src/plymouthd.defaults
+sed -i -e 's/fade-in/openSUSE/g' src/plymouthd.defaults
 
 %build
 autoreconf -fiv
@@ -387,28 +387,12 @@ rm -rf %{buildroot}
 if [ ! -e /.buildenv ]; then 
    [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
    %{_libexecdir}/plymouth/plymouth-update-initrd
-   if [ $1 -eq 1 ]; then
-      if [ -f %{_sysconfdir}/default/grub ]; then
-          sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
-          grub2-mkconfig -o /boot/grub2/grub.cfg
-      fi
-      if [ -f /boot/grub/menu.lst ]; then
-          sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
-      fi
-   fi
 fi
 
 %postun
 if [ $1 -eq 0 ]; then
     rm -f %{_libdir}/plymouth/default.so
     rm -f /boot/initrd-plymouth.img
-    if [ -f %{_sysconfdir}/default/grub ]; then
-       sed -i 's|splash|splash=silent|g' %{_sysconfdir}/default/grub
-       grub2-mkconfig -o /boot/grub2/grub.cfg
-    fi
-    if [ -f /boot/grub/menu.lst ]; then
-       sed -i 's|splash|splash=silent|g' /boot/grub/menu.lst
-    fi
 fi
 
 %post scripts -p /sbin/mkinitrd_setup