X-Git-Url: https://git.tld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=dracut.spec;h=4bf525ff296e410e2f5e7f3a506646cf675a0b30;hp=7215b1b5049bf2a350dd80141cf572662609e5b6;hb=e57fb00ab8a23934297547cfefbd3ccaa2cfe5ed;hpb=3f3a9504b008558380bea81c4ea45c00e05ae239

diff --git a/dracut.spec b/dracut.spec
index 7215b1b..4bf525f 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,25 +1,23 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	047
-Release:	5
+Version:	048
+Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	62d474ccb8411ec4a76ba5c79bc1093a
+# Source0-md5:	a9705d3c32c7523428f6e5e3e17244f8
 Source1:	tld.conf
 Source2:	update-initramfs
 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
-Patch10:	ext4.patch
-Patch11:	crypttab-keyscript.patch
+Patch3:		config.patch
+Patch4:		compressors.patch
+Patch5:		proc_sys_remount.patch
+Patch6:		misc_fixes.patch
+Patch7:		initrd-release.patch
+Patch8:		no_systemd_udevd.patch
+Patch9:		crypttab-keyscript.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
@@ -124,6 +122,7 @@ Group:		Base
 Requires:	%{name} = %{version}-%{release}
 Requires:	hmaccalc
 Requires:	nss-softokn-freebl
+Obsoletes:	dracut-fips-aesni
 
 %description fips
 This package requires everything which is needed to build an all
@@ -134,22 +133,6 @@ Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
 dracuta obrazów initramfs dowolnego przeznaczenia, wykonujących
 kontrolę własnej spójności.
 
-%package fips-aesni
-Summary:	Dracut modules to build a dracut initramfs with an integrity check with aesni-intel
-Summary(pl.UTF-8):	Moduły Dracuta do tworzenia initramfs z kontrolą spójności przez aesni-intel
-Group:		Base
-Requires:	%{name}-fips = %{version}-%{release}
-
-%description fips-aesni
-This package requires everything which is needed to build an all
-purpose initramfs with dracut, which does an integrity check and adds
-the aesni-intel kernel module.
-
-%description fips-aesni -l pl.UTF-8
-Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
-dracuta obrazów initramfs dowolnego przeznaczenia wykonujących
-kontrolę własnej spójności z dodanym modułem jądra aesni-intel.
-
 %package caps
 Summary:	Dracut modules to build a dracut initramfs which drops capabilities
 Summary(pl.UTF-8):	Moduły Dracuta do tworzenia initramfs zrzucającego uprawnienia
@@ -203,8 +186,6 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -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
@@ -328,10 +309,10 @@ 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/90stratis
+%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-gpg/README
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
@@ -359,6 +340,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh
 %dir %{dracutlibdir}/modules.d/95fstab-sys
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh
+%dir %{dracutlibdir}/modules.d/95qeth_rules
+%attr(755,root,root) %{dracutlibdir}/modules.d/95qeth_rules/*.sh
 %dir %{dracutlibdir}/modules.d/95zfcp
 %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh
 %dir %{dracutlibdir}/modules.d/95zfcp_rules
@@ -458,11 +441,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf
 
-%files fips-aesni
-%defattr(644,root,root,755)
-%dir %{dracutlibdir}/modules.d/02fips-aesni
-%attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh
-
 %files caps
 %defattr(644,root,root,755)
 %{dracutlibdir}/modules.d/02caps/README