X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=47cec7ccea1b347a481dc71cf08d646084cea744;hb=36e698a2438fb56397f8a135403136dd7756f76e;hp=0db48be02ea3b41ef3575e1a739c85edad034e8c;hpb=49644e2a46c4c194641dea736023516b1d2c9d44;p=packages%2Fdracut.git

diff --git a/dracut.spec b/dracut.spec
index 0db48be..47cec7c 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,22 +1,22 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	037
-Release:	4
+Version:	041
+Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	866982a7ab49e3e4442fe966eeff4111
+# Source0-md5:	ccde6cd8ef36b883b68d8e5954369a32
 Source1:	tld.conf
 Patch1:		plymouth-libexec.patch
 Patch2:		os-release.patch
 Patch3:		plymouth-logo.patch
 Patch4:		arch-libdir.patch
-Patch5:		systemd-paths.patch
 Patch6:		prelink-libs.patch
 Patch7:		config.patch
-Patch8:		misc_fixes.patch
-Patch100:	git.patch
+Patch8:		xz_compressor.patch
+Patch9:		proc_sys_remount.patch
+Patch10:	misc_fixes.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
@@ -24,6 +24,7 @@ BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libxslt-progs
 Requires:	bash
+Requires:	bzip2
 Requires:	coreutils
 Requires:	cpio
 Requires:	filesystem
@@ -33,18 +34,17 @@ Requires:	grep
 Requires:	gzip
 Requires:	hardlink
 Requires:	sed
-Requires:	systemd-units
 Requires:	udev
 Requires:	util-linux >= 2.22.2-3
 Requires:	vim-rt
 Requires:	vim-static
 Requires:	virtual(module-tools)
+Requires:	xz
 # disabled due to angry (bug)reports, because it changes well known
 # net device names from ethX to emX or pXpY
 #Suggests:	biosdevname
 Suggests:	btrfs-progs
 Suggests:	busybox
-Suggests:	bzip2
 Suggests:	cryptsetup
 Suggests:	dash
 Suggests:	device-mapper
@@ -62,9 +62,7 @@ Suggests:	plymouth
 Suggests:	suspend-utils
 Suggests:	syslogdaemon
 Suggests:	xfsprogs
-Suggests:	xz
 Conflicts:	kmod < 6
-Conflicts:	systemd < 1:199
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		dracutlibdir	%{_prefix}/lib/dracut
@@ -195,11 +193,11 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch100 -p1
+%patch9 -p1
+%patch10 -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
@@ -219,7 +217,6 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	libdir=%{_prefix}/lib \
 	bindir=%{_bindir} \
-	systemdsystemunitdir=%{systemdunitdir} \
 	sysconfdir=%{_sysconfdir} \
 	mandir=%{_mandir}
 
@@ -263,8 +260,6 @@ 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/03modsign
 %attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
 %dir %{dracutlibdir}/modules.d/03rescue
@@ -363,11 +358,6 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/98syslog/README
 %{dracutlibdir}/modules.d/98syslog/rsyslog.conf
 %attr(755,root,root) %{dracutlibdir}/modules.d/98syslog/*.sh
-%dir %{dracutlibdir}/modules.d/98systemd
-%{dracutlibdir}/modules.d/98systemd/*.service
-%{dracutlibdir}/modules.d/98systemd/*.target
-%attr(755,root,root) %{dracutlibdir}/modules.d/98systemd/*.sh
-%doc %{dracutlibdir}/modules.d/98systemd/*.8*
 %dir %{dracutlibdir}/modules.d/98usrmount
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
@@ -384,8 +374,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/skipcpio
 
 %dir /var/lib/initramfs
-%{systemdunitdir}/*.service
-%{systemdunitdir}/*/*.service
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.cmdline.7*