Accepting request 140489 from home:tittiatcoke:branches:Base:System

Dracut scripts

OBS-URL: https://build.opensuse.org/request/show/140489
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=91

plymouth-dracut-path.patch

@@ -0,0 +1,13 @@
+--- scripts/plymouth-populate-initrd.in	2012-08-21 01:25:52.000000000 +0200
++++ scripts/plymouth-populate-initrd.in	2012-11-01 18:27:22.760029873 +0100
+@@ -372,8 +372,8 @@
+ [ -z "$INITRDDIR" ] && usage error
+ 
+ mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
+-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd
+-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth
++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd
++inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
+ inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
+ inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR

plymouth.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov  6 18:07:29 UTC 2012 - tittiatcoke@gmail.com
+
+- Provide the scripts to integrate Plymouth in dracut as a 
+  separate package.
+  
+- Added patch (plymouth-dracut-path.patch) to correct the paths
+  inside the specific plymouth-dracut scripts
+  
 -------------------------------------------------------------------
 Mon Nov  5 17:35:39 UTC 2012 - crrodriguez@opensuse.org
 

plymouth.spec

@@ -44,6 +44,8 @@ Patch5:         plymouth-restore-suspend.patch
 Patch7:         plymouth-udevadm-path.patch
 # PATCH-OPENSUSE -- Remove tag not understood by systemd v44
 Patch8:         systemd-no-warning.patch
+# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin
+Patch9:         plymouth-dracut-path.patch
 Patch10:        0001-Some-greenish-openSUSE-colors.patch
 # PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976)
 Patch11:        plymouth-remove-pid-file.patch
@@ -140,6 +142,15 @@ Requires:       %{name} = %{version}
 This package contains utilities that integrate with Plymouth
 including a boot log viewing application.
 
+%package dracut
+Summary:        Plymouth related utilities for dracut
+Group:          System/Base
+Supplements:    packageand(plymouth:dracut)
+Requires:       %{name} = %{version}
+
+%description dracut
+This package contains utilities that integrate dracut with Plymouth
+
 %package x11-renderer
 Summary:        Plymouth X11 renderer
 Group:          System/Base
@@ -311,6 +322,7 @@ plugin.
 %endif
 %patch7 -p1
 %patch8 -p1
+%patch9 -p0
 %patch10 -p1
 #patch11 -p1
 %patch12
@@ -344,8 +356,6 @@ make %{?_smp_mflags} V=1
 
 %make_install
 rm -f %{buildroot}/%{_bindir}/rhgb-client
-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
@@ -482,6 +492,11 @@ fi
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
 %{_unitdir}/*
 
+%files dracut
+%defattr(-, root, root)
+%{_libexecdir}/plymouth/plymouth-populate-initrd
+%{_libexecdir}/plymouth/plymouth-generate-initrd
+
 %files devel
 %defattr(-, root, root)
 %{plymouth_libdir}/libply.so