diff options
| -rw-r--r-- | bootsplash.spec | 11 | ||||
| -rw-r--r-- | scripts/splash.sh | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index fba0b6d..0ed6bd0 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,5 +1,5 @@ %define name bootsplash -%define version 2.1.9 +%define version 2.1.11 %define release 1mdk %define _bootdir /boot @@ -61,8 +61,14 @@ for i in `echo $LANGUAGE:$LC_ALL:$LC_COLLATE:$LANG:C | tr ':' ' '` do if [ -r %{_datadir}/locale/$i/LC_MESSAGES/bootsplash.mo ]; then mkdir -p /etc/locale/$i/LC_MESSAGES/ + cp %{_datadir}/locale/$i/LC_MESSAGES/SYS_LC_MESSAGES \ + /etc/locale/$i/LC_MESSAGES/ cp %{_datadir}/locale/$i/LC_MESSAGES/bootsplash.mo \ /etc/locale/$i/LC_MESSAGES/ + for f in LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME; + do + cp -L %{_datadir}/locale/$i/$f /etc/locale/$i/$f + done break fi done @@ -85,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Tue Aug 31 2004 Warly <warly@mandrakesoft.com> 2.1.11-1mdk +- refresh the screen in non latin1 font with a separate /usr partition + * Fri Jul 16 2004 Warly <warly@mandrakesoft.com> 2.1.9-1mdk - fix rendering for UTF-8 mo (pablo) diff --git a/scripts/splash.sh b/scripts/splash.sh index e7c4c68..e7027ab 100644 --- a/scripts/splash.sh +++ b/scripts/splash.sh @@ -79,7 +79,7 @@ if [ "$1" == "stop" -a $_shutdown == "no" ]; then for i in 0 1 2 3 4 5 do if [[ -f /etc/bootsplash/themes/$theme/config/vt$i-$res.cfg ]]; then - splash -s -u $i /etc/bootsplash/themes/$theme/config/vt$i-$res.cfg + /sbin/splash -s -u $i /etc/bootsplash/themes/$theme/config/vt$i-$res.cfg fi done fi @@ -186,6 +186,12 @@ if [ "$progress" == 1 -o "$1" == "start" ]; then echo "silent" >/proc/splash chvt 1 else + if [ "$font" != "default" -a "$progress" != "1" -a -d /usr/share/bootsplash ]; then + if [[ -f /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg ]]; then + /sbin/splash -s -u 0 /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg + echo "show $(( 65534 * ( $progress + 1 ) / $num ))" > /proc/splash + fi + fi gprintf "Booting the system..." fi _boot=$TEXT |