diff --git a/plymouth.changes b/plymouth.changes index f9977cd..e1ff63f 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 15 09:09:23 UTC 2012 - tittiatcoke@gmail.com + +- Added a patch for openSUSE to enable the rebuild of the initrd + with the plymouth-set-default-theme script. (bnc#757284) + ------------------------------------------------------------------- Sun May 13 19:21:24 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 1a00e20..38b1548 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -344,7 +344,8 @@ make %{?_smp_mflags} %make_install rm -f %{buildroot}/%{_bindir}/rhgb-client -rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-*-initrd +rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd +rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd #Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin @@ -421,10 +422,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme spinfinity - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R spinfinity fi fi @@ -432,8 +430,7 @@ fi if [ $1 -eq 0 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -441,10 +438,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme fade-in - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R fade-in fi fi @@ -452,8 +446,7 @@ fi if [ $1 -eq 0 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -461,10 +454,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme solar - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R solar fi fi @@ -472,8 +462,7 @@ fi if [ $1 -eq 0 ]; then export lib=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -481,10 +470,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme openSUSE - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R openSUSE fi fi @@ -492,8 +478,7 @@ fi if [ $1 -eq 0 ]; then export lib=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -504,7 +489,6 @@ fi %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details %dir %{_datadir}/plymouth/themes/text -%dir %{_libexecdir}/plymouth %dir %{_localstatedir}/lib/plymouth %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers @@ -554,7 +538,9 @@ fi %files scripts %defattr(-, root, root) +%dir %{_libexecdir}/plymouth %{_sbindir}/plymouth-set-default-theme +%{_libexecdir}/plymouth/plymouth-update-initrd /lib/mkinitrd/scripts/boot-plymouth.sh /lib/mkinitrd/scripts/boot-plymouth.chroot.sh /lib/mkinitrd/scripts/setup-plymouth.sh diff --git a/suse-initrd-support b/suse-initrd-support index d8e9f92..ad20771 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -93,3 +93,9 @@ +fi +install -D ${_pangomod} $tmp_mnt/${_pangomod} +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 +@@ -1,2 +1,2 @@ + #!/bin/bash +-mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r) ++mkinitrd -i initrd-$(uname -r) -k vmlinuz-$(uname -r)