- fix paths to plymouthd

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 60dfbafb2ed80f29137739e244c29f7240d25bc4..9a66c78bef6f61adce0197f4c0eeeef0e5a06113 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,19 +1,22 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       025
-Release:       1
+Version:       026
+Release:       1.1
 License:       GPL v2+
 Group:         Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 62bb8de340afbe19756e40a846f935de
+# Source0-md5: 269bfb2a0c755fe267ca3c1f5c9f7be0
 Source1:       pld.conf
 Patch0:                bash-sh.patch
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch
+Patch5:                systemd-paths.patch
+Patch6:                plymouthd-path.patch
 URL:           https://dracut.wiki.kernel.org/
+BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
@@ -59,6 +62,7 @@ Suggests:     syslogdaemon
 Suggests:      xfsprogs
 Suggests:      xz
 Conflicts:     kmod < 6
+Conflicts:     systemd < 1:198
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -177,6 +181,8 @@ konfiguracji maszyn.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
@@ -236,6 +242,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/00dash
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
+%dir %{dracutlibdir}/modules.d/00systemd-bootchart
+%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/01bash
 %attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.sh
 %dir %{dracutlibdir}/modules.d/04watchdog
@@ -354,10 +362,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/dracut-cmdline.service.8*
 %{_mandir}/man8/dracut-initqueue.service.8*
+%{_mandir}/man8/dracut-mount.service.8*
+%{_mandir}/man8/dracut-pre-mount.service.8*
 %{_mandir}/man8/dracut-pre-pivot.service.8*
 %{_mandir}/man8/dracut-pre-trigger.service.8*
 %{_mandir}/man8/dracut-pre-udev.service.8*
-%{_mandir}/man8/initrd-switch-root.service.8*
 %{_mandir}/man8/mkinitrd.8*
 %{_mandir}/man8/udevadm-cleanup-db.service.8*