From 467171da62fd5fc6a4bda3beff0dfc1c4cadc505f20c0385518ef00422b50075 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Wed, 22 Aug 2012 11:44:32 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=78

---
 plymouth.changes    | 6 ++++++
 suse-initrd-support | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plymouth.changes b/plymouth.changes
index c827da1..63a831b 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 22 11:41:57 UTC 2012 - tittiatcoke@gmail.com
+
+- Ensure that the right Pango version is used for copying one of
+  the pango modules
+
 -------------------------------------------------------------------
 Wed Aug  8 09:03:58 UTC 2012 - fcrozat@suse.com
 
diff --git a/suse-initrd-support b/suse-initrd-support
index 737740b..cdc6d3c 100644
--- a/suse-initrd-support
+++ b/suse-initrd-support
@@ -121,11 +121,11 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in
 +  then
 +     _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'`
 +     _pangomod="/etc/pango/pango64.modules"
-+     pangobasicfc="/usr/lib64/pango/1.6.0/modules/pango-basic-fc.so"
++     pangobasicfc="${_pangodir}/pango-basic-fc.so"
 +  else
 +     _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'`
 +     _pangomod="/etc/pango/pango.modules"
-+     pangobasicfc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so"
++     pangobasicfc="${_pangodir}/pango-basic-fc.so"
 +fi
 +install -D ${_pangomod} $tmp_mnt/${_pangomod}
 +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}

From bcd47dea1cd7e83cbd75d1827c27fb3fbf7735f5e57f462775905dc7faa95c6f Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Thu, 23 Aug 2012 08:06:58 +0000
Subject: [PATCH 2/2] Accepting request 131368 from
 home:fcrozat:branches:Base:System

- Add plymouth-after-udev-settle.patch: ensure plymouth is started
  after udev triggers has been started (git + name change due to
  systemd < 183 in openSUSE 12.2).

OBS-URL: https://build.opensuse.org/request/show/131368
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=79
---
 plymouth-after-udev-settle.patch | 13 +++++++++++++
 plymouth.changes                 |  7 +++++++
 plymouth.spec                    |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 plymouth-after-udev-settle.patch

diff --git a/plymouth-after-udev-settle.patch b/plymouth-after-udev-settle.patch
new file mode 100644
index 0000000..92a09e9
--- /dev/null
+++ b/plymouth-after-udev-settle.patch
@@ -0,0 +1,13 @@
+Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
+===================================================================
+--- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in
++++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
+@@ -2,7 +2,7 @@
+ Description=Show Plymouth Boot Screen
+ DefaultDependencies=no
+ Wants=systemd-ask-password-plymouth.path
+-After=systemd-vconsole-setup.service systemd-udev-settle.service
++After=systemd-vconsole-setup.service udev-trigger.service
+ Before=systemd-ask-password-plymouth.service
+ ConditionKernelCommandLine=!plymouth.enable=0
+ ConditionPathExists=!@plymouthruntimedir@/pid
diff --git a/plymouth.changes b/plymouth.changes
index 63a831b..622f5f1 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 22 14:04:13 UTC 2012 - fcrozat@suse.com
+
+- Add plymouth-after-udev-settle.patch: ensure plymouth is started
+  after udev triggers has been started (git + name change due to
+  systemd < 183 in openSUSE 12.2).
+
 -------------------------------------------------------------------
 Wed Aug 22 11:41:57 UTC 2012 - tittiatcoke@gmail.com
 
diff --git a/plymouth.spec b/plymouth.spec
index ed3cc57..265733b 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -52,6 +52,8 @@ Patch9:         0001-ply-text-progress-bar-strip-quotes-if-present.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
 # PATCH-FIX-UPSTREAM -- Fix systemd service file
 Patch11:        plymouth-fix-systemd-service.patch
+# PATCH-FIX-UPSTREAM -- Start plymouth avec udev-trigger.service
+Patch12:        plymouth-after-udev-settle.patch
 BuildRequires:  automake
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
@@ -317,6 +319,7 @@ plugin.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch12 -p1
 
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c