From 765603b9789fa9d22184ee246150e3aee9c8954145bdf6e56bf7ee7c7d8fc33e Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Mon, 26 Mar 2012 06:10:46 +0000
Subject: [PATCH] Update to 0.8.4 final.

OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=16
---
 plymouth-0.8.3_git201110131555.tar.bz2 |  3 ---
 plymouth-0.8.4.tar.bz2                 |  3 +++
 plymouth.changes                       | 12 +++++++++++
 plymouth.spec                          | 30 +++++++++++++++++++-------
 4 files changed, 37 insertions(+), 11 deletions(-)
 delete mode 100644 plymouth-0.8.3_git201110131555.tar.bz2
 create mode 100644 plymouth-0.8.4.tar.bz2

diff --git a/plymouth-0.8.3_git201110131555.tar.bz2 b/plymouth-0.8.3_git201110131555.tar.bz2
deleted file mode 100644
index 0cd2bf2..0000000
--- a/plymouth-0.8.3_git201110131555.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ed5bfb0f8b4b4ca8b7df0da5311c2a22f8054ebf6b6264b447c75ad712ffd41
-size 816336
diff --git a/plymouth-0.8.4.tar.bz2 b/plymouth-0.8.4.tar.bz2
new file mode 100644
index 0000000..96b3499
--- /dev/null
+++ b/plymouth-0.8.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e272163adf99dec9ad16bd6ad72a0610f19da8146d413f310e1b118a03b90d6
+size 1142933
diff --git a/plymouth.changes b/plymouth.changes
index 5868c96..111c08c 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Mar 25 09:03:44 UTC 2012 - tittiatcoke@gmail.com
+
+- Update to the official release of 0.8.4
+  * Bugfix:  Use /dev/fb0 instead of /dev/fb, this resolves the 
+    issue of not showing the splash during shutdown
+
+-------------------------------------------------------------------
+Fri Mar  9 12:11:44 UTC 2012 - tittiatcoke@gmail.com
+
+- Add a small change in order to have plymouth activated with Grub2
+
 -------------------------------------------------------------------
 Thu Feb 23 15:57:44 UTC 2012 - tittiatcoke@gmail.com
 
diff --git a/plymouth.spec b/plymouth.spec
index 1443258..e4af974 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -11,7 +11,7 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -21,16 +21,17 @@
 %define plymouth_libdir %{_libdir}
 %define plymouth_initrd_file /boot/initrd-plymouth.img
 
-%define tarversion 0.8.3
+%define tarversion 0.8.4
 %define patchversion 201110131555
 
 Name:           plymouth
-Version:        %{tarversion}_git%{patchversion}
+#Version:        %{tarversion}_git%{patchversion}
+Version:        0.8.4
 Release:        0
-License:        GPL-2.0+
 Summary:        Graphical Boot Animation and Logger
-Url:            http://freedesktop.org/software/plymouth/releases
+License:        GPL-2.0+
 Group:          System/Base
+Url:            http://freedesktop.org/software/plymouth/releases
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        boot-duration
 Source2:        opensuse-logo.png
@@ -49,7 +50,7 @@ BuildRequires:  pkgconfig(libdrm_intel)
 BuildRequires:  pkgconfig(libdrm_nouveau)
 BuildRequires:  pkgconfig(libdrm_radeon)
 BuildRequires:  pkgconfig(libkms)
-Requires:       %{name}-branding = %{version}
+Requires:       %{name}-branding
 Requires:       suspend >= 0.80.20100129.1
 Requires:       systemd-plymouth
 Provides:       bootsplash = %{version}
@@ -159,10 +160,10 @@ while other images pulsate around during system boot up.
 %package plugin-throbgress
 Summary:        Plymouth "Throbgress" plugin
 Group:          System/Base
+Requires:       %{name}-plugin-label = %{version}
 Requires:       libply-splash-core2 = %{version}
 Requires:       libply-splash-graphics2 = %{version}
 Requires:       libply2 = %{version}
-Requires:       %{name}-plugin-label = %{version}
 
 %description plugin-throbgress
 This package contains the "throbgress" boot splash plugin for
@@ -173,10 +174,10 @@ the screen.
 %package plugin-space-flares
 Summary:        Plymouth "space-flares" plugin
 Group:          System/Base
+Requires:       %{name}-plugin-label = %{version}
 Requires:       libply-splash-core2 = %{version}
 Requires:       libply-splash-graphics2 = %{version}
 Requires:       libply2 = %{version}
-Requires:       %{name}-plugin-label = %{version}
 
 %description plugin-space-flares
 This package contains the "space-flares" boot splash plugin for
@@ -343,7 +344,20 @@ rm -rf %{buildroot}
 
 %post
 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
+if [ $1 -eq 1 ]; then
+   if [ -f %{_sysconfdir}/default/grub ]; then
+        sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
+   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
+    fi
+fi
 
 %post scripts -p /sbin/mkinitrd_setup
 %postun scripts -p /sbin/mkinitrd_setup