From d959090a15704d66af3335f15cf0546daf80845e89fd23b9e198ea339c955830 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Fri, 17 Feb 2012 18:05:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=3

---
 plymouth.changes    | 7 +++++++
 plymouth.spec       | 5 +++++
 suse-initrd-support | 4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plymouth.changes b/plymouth.changes
index 503021f..3e8af8f 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 17 18:04:29 UTC 2012 - tittiatcoke@gmail.com
+
+- Ensure that /bin/plymouth still is available as that the 
+  displaymanagers (KDM/GDM) are expecting this. This needs to be 
+  in place until the migration to /usr is completed.
+
 -------------------------------------------------------------------
 Fri Feb 17 09:25:11 UTC 2012 - tittiatcoke@gmail.com
 
diff --git a/plymouth.spec b/plymouth.spec
index 08c10e9..83122c0 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -275,6 +275,11 @@ make %{?_smp_mflags}
 rm -f %{buildroot}/%{_bindir}/rhgb-client
 rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-*-initrd
 
+#Link the plymouth client binary also to /bin until the move to /usr is completed
+mkdir %{buildroot}/bin
+ln -s %{buildroot}/usr/bin/plymouth %{buildroot}/bin/plymouth
+
+
 # Glow isn't quite ready for primetime
 rm -rf %{buildroot}%{_datadir}/plymouth/glow/
 rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/
diff --git a/suse-initrd-support b/suse-initrd-support
index a30bd98..8f2545f 100644
--- a/suse-initrd-support
+++ b/suse-initrd-support
@@ -38,7 +38,7 @@
 +plymouth show-splash
 --- /dev/null
 +++ plymouth-0.8.3_git201110131555/scripts/setup-plymouth.sh.in
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,43 @@
 +#!/bin/bash
 +#
 +#%stage: setup
@@ -64,6 +64,8 @@
 +	@PLYMOUTH_DATADIR@/plymouth/plymouthd.defaults \
 +	@PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/* \
 +	@PLYMOUTH_DATADIR@/plymouth/logo.png \
++       /usr/bin/plymouth \
++       /usr/sbin/plymouthd \
 +	/etc/plymouth/plymouthd.conf"
 +
 +PLUGINS="${PLUGIN_PATH}/details.so \