- updated plymouth sed call

diff --git a/dracut.spec b/dracut.spec
index f81b6d83fe5291a3921cf973ae675a19f77abbcb..a8ca6d434174ff35824bf4b2ceb464fb52bf05fd 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -199,7 +199,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch4 -p1
 %patch5 -p1
 
-%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
+%{__sed} -i -e 's,@libexecdir@,%{_libexecdir},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
@@ -225,7 +225,7 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
 install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 
-echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
+echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
 
 # create compat symlink
 ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut

diff --git a/plymouth-libdir.patch b/plymouth-libdir.patch
index b402c2125dd564fcacd9dc7ede806a8cb15e6d68..3b120f1fa29fe4c4df3ba2e59341ec57c0b9ec59 100644 (file)
--- a/plymouth-libdir.patch
+++ b/plymouth-libdir.patch
@@ -5,7 +5,7 @@
  
  pkglib_dir() {
 -    local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
-+    local _dirs="/usr/libexec/plymouth/"
++    local _dirs="@libexecdir@/plymouth/"
      if type -P dpkg-architecture &>/dev/null; then
          _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
      fi