- rel 2

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 1d9d84dc4fba31777cca5fe9718fe70c34a6e423..fe7b58f1059259905e61944a45d2f4d54d3aedeb 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:       024
-Release:       1
+Version:       026
+Release:       2
 License:       GPL v2+
 Group:         Base
-Source0:       ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 253080492f6f0168be24a60758fa6b31
+Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
+# Source0-md5: 269bfb2a0c755fe267ca3c1f5c9f7be0
 Source1:       pld.conf
-Patch0:                no-rh.patch
-Patch1:                bash-sh.patch
-Patch2:                plymouth-libexec.patch
-Patch4:                os-release.patch
-Patch5:                plymouth-logo.patch
+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
@@ -172,13 +176,16 @@ konfiguracji maszyn.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %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
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
@@ -214,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS HACKING NEWS README TODO dracut.html dracut.png dracut.svg
+%doc AUTHORS HACKING NEWS README* TODO dracut.html dracut.png dracut.svg
 %dir %{_sysconfdir}/dracut.conf.d
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf
@@ -235,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
@@ -247,6 +256,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
 %dir %{dracutlibdir}/modules.d/30convertfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
+%dir %{dracutlibdir}/modules.d/50drm
+%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh
 %dir %{dracutlibdir}/modules.d/50plymouth
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
@@ -266,6 +277,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh
 %dir %{dracutlibdir}/modules.d/90dmsquash-live
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh
+%{dracutlibdir}/modules.d/90dmsquash-live/checkisomd5@.service
 %dir %{dracutlibdir}/modules.d/90kernel-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
 %dir %{dracutlibdir}/modules.d/90lvm
@@ -350,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*