Accepting request 121679 from Base:System

Latest update for Plymouth. With this Plymouth should be in the right shape to make it default instead of bootsplash/splashy. Fixed the latest bug reported by tigerfoot as reported on IRC and I am ready for plymouth to be the default

OBS-URL: https://build.opensuse.org/request/show/121679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=9

plymouth.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 21 11:25:36 UTC 2012 - tittiatcoke@gmail.com
+
+- Update the installation/update from plymouth in a way that the 
+  initrd file for the current running kernel is updated.
+- Corrected a typo with regards to the location of a pango module
+  when setting up the initrd. 
+
 -------------------------------------------------------------------
 Tue May 15 09:09:23 UTC 2012 - tittiatcoke@gmail.com
 

plymouth.spec

@@ -59,6 +59,7 @@ Provides:       bootsplash = %{version}
 Obsoletes:      bootsplash < %{version}
 Requires:       gnu-unifont-bitmap-fonts
 Requires(post): plymouth-scripts
+Requires(post): mkinitrd
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -139,8 +140,8 @@ Requires:       coreutils
 Requires:       cpio
 Requires:       findutils
 Requires:       gzip
-Requires:       mkinitrd
 Requires:       plymouth
+Requires(post): mkinitrd
 BuildArch:      noarch
 
 %description scripts
@@ -379,14 +380,17 @@ popd
 rm -rf %{buildroot}
 
 %post
-[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
-if [ $1 -eq 1 ]; then
-   if [ -f %{_sysconfdir}/default/grub ]; then
-        sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
-        grub2-mkconfig -o /boot/grub2/grub.cfg
-   fi
-   if [ -f /boot/grub/menu.lst ]; then
-        sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
+if [ ! -e /.buildenv ]; then 
+   [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
+   %{_libexecdir}/plymouth/plymouth-update-initrd
+   if [ $1 -eq 1 ]; then
+      if [ -f %{_sysconfdir}/default/grub ]; then
+          sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
+          grub2-mkconfig -o /boot/grub2/grub.cfg
+      fi
+      if [ -f /boot/grub/menu.lst ]; then
+          sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst
+      fi
    fi
 fi
 
@@ -419,7 +423,7 @@ fi
 %postun -n libply2 -p /sbin/ldconfig
 
 %post theme-spinfinity
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R spinfinity
@@ -435,7 +439,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-fade-in
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R fade-in
@@ -451,7 +455,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post theme-solar
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R solar
@@ -467,7 +471,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post branding-openSUSE
-if [ $1 -eq 1 ]; then
+if [ $1 -eq 1 -a ! -e /.buildenv ]; then
    export LIB=%{_libdir}
    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
       %{_sbindir}/plymouth-set-default-theme -R openSUSE

suse-initrd-support

@@ -33,7 +33,7 @@
 +plymouth show-splash
 --- /dev/null
 +++ new/scripts/setup-plymouth.sh.in	2012-04-03 11:11:44.656337240 +0200
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,61 @@
 +#!/bin/bash
 +#
 +#%stage: setup
@@ -63,8 +63,7 @@
 +       /usr/share/fonts/uni/unifont.pcf.gz \
 +       /etc/fonts/fonts.conf \
 +       /etc/fonts/conf.d/69-unifont.conf \
-+       /etc/fonts/conf.avail/69-unifont.conf \
-+       /usr/lib/pango/1.6.0/modules/pango-basic-fc.so "
++       /etc/fonts/conf.avail/69-unifont.conf "
 +
 +PLUGINS="${PLUGIN_PATH}/details.so \
 +	${PLUGIN_PATH}/text.so \
@@ -87,11 +86,14 @@
 +  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"
 +  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"
 +fi
 +install -D ${_pangomod} $tmp_mnt/${_pangomod}
++install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}
 +mkdir -p $tmp_mnt/var/cache/fontconfig
 --- plymouth-0.8.4/scripts/plymouth-update-initrd	2008-12-19 05:36:55.000000000 +0100
 +++ new/scripts/plymouth-update-initrd	2012-05-15 10:59:08.158501726 +0200