- updated to 034

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 84ce7834eb7bb675174ec0ea52d6e382cec85197..b9abbe185a16ba7df224a8e7d9fb5add57cfb3c5 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,19 +1,21 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       026
+Version:       034
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 269bfb2a0c755fe267ca3c1f5c9f7be0
+# Source0-md5: 8afdca5b30b98ae8ce603fbb7894068e
 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:                prelink-libs.patch
 URL:           https://dracut.wiki.kernel.org/
+BuildRequires: asciidoc
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
@@ -30,7 +32,7 @@ Requires:     hardlink
 Requires:      sed
 Requires:      systemd-units
 Requires:      udev
-Requires:      util-linux >= 2.20
+Requires:      util-linux >= 2.22.2-3
 Requires:      vim-rt
 Requires:      vim-static
 Requires:      virtual(module-tools)
@@ -59,7 +61,7 @@ Suggests:     syslogdaemon
 Suggests:      xfsprogs
 Suggests:      xz
 Conflicts:     kmod < 6
-Conflicts:     systemd < 1:198
+Conflicts:     systemd < 1:199
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -171,13 +173,27 @@ configuration.
 Ten pakiet zawiera narzędzia do łączenia lokalnych initrd oraz
 konfiguracji maszyn.
 
+%package -n bash-completion-dracut
+Summary:       bash-completion for dracut
+Summary(pl.UTF-8):     Bashowe dopełnianie składni dla polecenia dracut
+Group:         Applications/Shells
+Requires:      %{name} = %{version}
+Requires:      bash-completion >= 2.0
+
+%description -n bash-completion-dracut
+bash-completion for dracut.
+
+%description -n bash-completion-dracut -l pl.UTF-8
+Bashowe dopełnianie składni dla polecenia dracut.
+
 %prep
 %setup -q
-%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
@@ -205,6 +221,8 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
 install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 
+echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
+
 # create compat symlink
 ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 
@@ -233,14 +251,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/dracut-functions
 %attr(755,root,root) %{dracutlibdir}/dracut-logger.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore
+%dir %{dracutlibdir}/modules.d/00bash
+%attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh
 %dir %{dracutlibdir}/modules.d/00bootchart
 %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/03modsign
+%attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
+%dir %{dracutlibdir}/modules.d/03rescue
+%attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh
 %dir %{dracutlibdir}/modules.d/04watchdog
 %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
 %dir %{dracutlibdir}/modules.d/05busybox
@@ -300,7 +322,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/95fstab-sys
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh
 %dir %{dracutlibdir}/modules.d/95zfcp
-%{dracutlibdir}/modules.d/95zfcp/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh
 %dir %{dracutlibdir}/modules.d/95terminfo
 %attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh
@@ -362,8 +383,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}/man8/udevadm-cleanup-db.service.8*
+%{_mandir}/man7/dracut.bootup.7.gz
+
+#/usr/lib/kernel/install.d/50-dracut.install
+#/usr/lib/kernel/install.d/51-dracut-rescue.install
 
 %files network
 %defattr(644,root,root,755)
@@ -417,3 +442,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /boot/dracut
 %dir /var/lib/dracut
 %dir /var/lib/dracut/overlay
+
+%files -n bash-completion-dracut
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/dracut
+%{_datadir}/bash-completion/completions/lsinitrd