X-Git-Url: https://git.tld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=dracut.spec;h=709ce1510e9d3e7a26427e746bd8cecb1bfd6f40;hp=386506d5341fb77f9f95d299d605a05c31cfb1ae;hb=6e9542887007f5af61d385af9a048f7cdb86c4e4;hpb=74bd56f370f53edcac8a6bf01b86865648069331

diff --git a/dracut.spec b/dracut.spec
index 386506d..709ce15 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,31 +1,31 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	044
+Version:	047
 Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	fbb8b6aea24c2f7d328021bbf11788fd
+# Source0-md5:	62d474ccb8411ec4a76ba5c79bc1093a
 Source1:	tld.conf
 Source2:	update-initramfs
-Patch1:		plymouth-libexec.patch
-Patch2:		os-release.patch
-Patch3:		plymouth-logo.patch
-Patch4:		arch-libdir.patch
-Patch6:		prelink-libs.patch
-Patch7:		config.patch
-Patch8:		compressors.patch
-Patch9:		proc_sys_remount.patch
-Patch10:	misc_fixes.patch
-Patch11:	initrd-release.patch
-Patch12:	no_systemd_udevd.patch
+Patch1:		os-release.patch
+Patch2:		arch-libdir.patch
+Patch3:		prelink-libs.patch
+Patch4:		config.patch
+Patch5:		compressors.patch
+Patch6:		proc_sys_remount.patch
+Patch7:		misc_fixes.patch
+Patch8:		initrd-release.patch
+Patch9:		no_systemd_udevd.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	kmod-devel >= 23
 BuildRequires:	libxslt-progs
+BuildRequires:	pkgconfig
 Requires:	bash
 Requires:	bzip2
 Requires:	coreutils
@@ -36,6 +36,7 @@ Requires:	glibc-misc
 Requires:	grep
 Requires:	gzip
 Requires:	hardlink
+Requires:	kmod >= 23
 Requires:	sed
 Requires:	udev
 Requires:	util-linux >= 2.22.2-3
@@ -96,7 +97,7 @@ Requires:	bridge-utils
 Requires:	dhcp-client
 Requires:	iproute2
 Requires:	iputils-arping
-Requires:	iputils-ping
+Requires:	ping
 Requires:	nbd
 Requires:	net-tools
 Requires:	nfs-utils-clients
@@ -200,9 +201,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -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
@@ -242,8 +240,9 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd-suse.8
 
 # remove systemd stuff
-%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,00systemd-bootchart,01systemd-initrd,02systemd-networkd,98dracut-systemd}
-%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd.service
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@}.service
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -295,13 +294,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
+%dir %{dracutlibdir}/modules.d/80lvmmerge
+%{dracutlibdir}/modules.d/80lvmmerge/README.md
+%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh
+%dir %{dracutlibdir}/modules.d/81cio_ignore
+%attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
 %dir %{dracutlibdir}/modules.d/90crypt
 %attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh
-%dir %{dracutlibdir}/modules.d/91crypt-loop
-%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
 %dir %{dracutlibdir}/modules.d/90dm
 %{dracutlibdir}/modules.d/90dm/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh
@@ -310,7 +312,8 @@ 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/90dmsquash-live-ntfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-ntfs/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
 %dir %{dracutlibdir}/modules.d/90lvm
@@ -321,12 +324,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
+%dir %{dracutlibdir}/modules.d/90multipath-hostonly
+%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath-hostonly/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
+%{dracutlibdir}/modules.d/91crypt-gpg/README
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
+%dir %{dracutlibdir}/modules.d/91crypt-loop
+%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
+%dir %{dracutlibdir}/modules.d/91zipl
+%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
+%dir %{dracutlibdir}/modules.d/95dcssblk
+%attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
+%dir %{dracutlibdir}/modules.d/95lunmask
+%attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block
@@ -394,20 +408,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
+%{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.modules.7*
 %{_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/dracut-shutdown.service.8*
 %{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man7/dracut.bootup.7.gz
 
 #/usr/lib/kernel/install.d/50-dracut.install
 #/usr/lib/kernel/install.d/51-dracut-rescue.install