From 50bb899c1208b579805c05cd49ae09e3d863bf9b8e90ca505255423d4bf4b809 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 11 Oct 2012 09:17:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=84 --- plymouth.changes | 11 +++++++++++ plymouth.spec | 1 - suse-initrd-support | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 05e2e45..26dab89 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 11 09:13:33 UTC 2012 - tittiatcoke@gmail.com + +- Fix the Pango installation within the initrd. This would + resolve the error message that Pango cannot find any fonts + +------------------------------------------------------------------- +Thu Sep 27 12:37:13 UTC 2012 - tittiatcoke@gmail.com + +- fix the libdir path in plymouth-set-default-theme (bnc#780085) + ------------------------------------------------------------------- Thu Sep 20 09:45:07 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 9a810df..a2a4e11 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -155,7 +155,6 @@ Requires: findutils Requires: gzip Requires: plymouth Requires(post): mkinitrd -BuildArch: noarch %description scripts This package contains scripts that help integrate Plymouth with diff --git a/suse-initrd-support b/suse-initrd-support index cdc6d3c..cb04ea1 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -117,17 +117,17 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in +done + +_libdir=`rpm --eval '%{_lib}'` ++mkdir -p $tmp_mnt/etc/pango +if [ "$_libdir" == "lib64" ]; + then + _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango64.modules" ++ pango-querymodules-64 > $tmp_mnt/etc/pango/pango.modules + pangobasicfc="${_pangodir}/pango-basic-fc.so" + else + _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango.modules" ++ pango-querymodules > $tmp_mnt/etc/pango/pango.modules + pangobasicfc="${_pangodir}/pango-basic-fc.so" +fi -+install -D ${_pangomod} $tmp_mnt/${_pangomod} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +mkdir -p $tmp_mnt/var/cache/fontconfig Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd