Accepting request 121293 from Base:System

Using an adjusted script to make it easier for the user to rebuild the initrd when setting a new theme.

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

plymouth.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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
+
+- Added plymouth to the requires of plymouth-scripts. This 
+  should resolve bug (bnc#757284)
+
 -------------------------------------------------------------------
 Fri May 11 19:56:24 UTC 2012 - nmo.marques@gmail.com
 

plymouth.spec

@@ -140,6 +140,7 @@ Requires:       cpio
 Requires:       findutils
 Requires:       gzip
 Requires:       mkinitrd
+Requires:       plymouth
 BuildArch:      noarch
 
 %description scripts
@@ -231,6 +232,7 @@ Supplements:    packageand(plymouth:branding-upstream)
 Provides:       %{name}-branding = %{version}
 BuildArch:      noarch
 Conflicts:      otherproviders(plymouth-branding)
+Requires(pre):  %{name}
 
 %description branding-upstream
 This metapackage tracks the Plymouth default theme from upstream.
@@ -264,6 +266,7 @@ while stars twinkle around the logo during system boot up.
 Summary:        Plymouth "Spinfinity" theme
 Group:          System/Base
 Requires:       %{name}-plugin-throbgress = %{version}
+Requires(pre):  %{name}
 BuildArch:      noarch
 Requires(post): %{name}-scripts
 
@@ -341,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
@@ -418,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
 
@@ -429,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
 
@@ -438,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
 
@@ -449,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
 
@@ -458,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
 
@@ -469,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
 
@@ -478,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
 
@@ -489,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
 
@@ -501,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
@@ -551,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

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)