- plymounth stuff is in libexec now

- rel 3

diff --git a/dracut.spec b/dracut.spec
index d1397c8611832cff8023032b560f87d65f932929..421a5b7836cd01ec26828efb849fafd9d449fa00 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,13 +2,13 @@ Summary:      Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       046
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
 # Source0-md5: 224b67e9bc079e013541a74e85659188
 Source1:       pld.conf
-Patch1:                plymouth-libexec.patch
+Patch1:                plymouth-libdir.patch
 Patch2:                os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch

diff --git a/plymouth-libexec.patch b/plymouth-libdir.patch
similarity index 61%
rename from plymouth-libexec.patch
rename to plymouth-libdir.patch
index 24c4bf84202bf27a267c68186131370c03443a59..dbec4ac21482b4a6744ba51f7b622832a5437ac3 100644 (file)
--- a/plymouth-libexec.patch
+++ b/plymouth-libdir.patch
@@ -1,7 +1,7 @@
 diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/modules.d/50plymouth/module-setup.sh
 --- dracut-040.orig/modules.d/50plymouth/module-setup.sh       2014-10-24 17:41:12.966283303 +0200
 +++ dracut-040/modules.d/50plymouth/module-setup.sh    2014-10-24 17:42:58.112954942 +0200
-@@ -13,11 +13,11 @@
+@@ -13,7 +13,7 @@
  
  # called by dracut
  install() {
@@ -10,8 +10,3 @@ diff -urN dracut-040.orig/modules.d/50plymouth/module-setup.sh dracut-040/module
      if type -P dpkg-architecture &>/dev/null; then
          PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
      fi
--    [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
-+    [ -x /usr/@lib@/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/@lib@/plymouth"
- 
-     if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
-         || [ ! -x ${PKGLIBDIR}/plymouth-populate-initrd ]; then