- added fixes from upstream

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 9a66c78bef6f61adce0197f4c0eeeef0e5a06113..86be0fd1f6540b99d53ad33cd8da4b727c60260c 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       026
-Release:       1.1
+Version:       027
+Release:       3
 License:       GPL v2+
 Group:         Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 269bfb2a0c755fe267ca3c1f5c9f7be0
+# Source0-md5: 37d791ca7e9c0fdc0bf8902f579b9e2b
 Source1:       pld.conf
 Patch0:                bash-sh.patch
 Patch1:                plymouth-libexec.patch
@@ -15,6 +15,7 @@ Patch3:               plymouth-logo.patch
 Patch4:                arch-libdir.patch
 Patch5:                systemd-paths.patch
 Patch6:                plymouthd-path.patch
+Patch100:      git.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -33,7 +34,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)
@@ -174,8 +175,22 @@ 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
+%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -210,6 +225,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
 
@@ -246,6 +263,8 @@ rm -rf $RPM_BUILD_ROOT
 %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/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
@@ -368,7 +387,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut-pre-trigger.service.8*
 %{_mandir}/man8/dracut-pre-udev.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)
@@ -422,3 +444,7 @@ 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