From 467171da62fd5fc6a4bda3beff0dfc1c4cadc505f20c0385518ef00422b50075 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Wed, 22 Aug 2012 11:44:32 +0000 Subject: [PATCH] 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}