X-Git-Url: https://git.pld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=dracut.spec;h=c87c0b773abd0c5025d134cb5cbe6ce62216a8fd;hp=48d855a442ae8d78e8e810bd7edaf30fe4fde628;hb=d038c19cfb43ab894f5a19d4ecae3f5e9db75b82;hpb=525de250857571702d4d40ece1ed252235dc9109

diff --git a/dracut.spec b/dracut.spec
index 48d855a..c87c0b7 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,18 +1,22 @@
 Summary:	Initramfs generator using udev
+Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	019
-Release:	1
+Version:	027
+Release:	2
 License:	GPL v2+
 Group:		Base
-Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	ff7766d1fdb00f47af6c66f6a2ae8cea
+Source0:	http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
+# Source0-md5:	37d791ca7e9c0fdc0bf8902f579b9e2b
 Source1:	pld.conf
-Patch0:		no-rh.patch
-Patch1:		bash-sh.patch
-Patch2:		plymouth-libexec.patch
-Patch3:		reboot-opts.patch
-Patch4:		os-release.patch
+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:		plymouthd-path.patch
 URL:		https://dracut.wiki.kernel.org/
+BuildRequires:	asciidoc
 BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
@@ -29,7 +33,9 @@ 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)
 # disabled due to angry (bug)reports, because it changes well known
 # net device names from ethX to emX or pXpY
@@ -56,7 +62,7 @@ Suggests:	syslogdaemon
 Suggests:	xfsprogs
 Suggests:	xz
 Conflicts:	kmod < 6
-BuildArch:	noarch
+Conflicts:	systemd < 1:198
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		dracutlibdir	%{_prefix}/lib/dracut
@@ -69,8 +75,18 @@ which are driven by the event-based udev. Having root on MD, DM, LVM2,
 LUKS is supported as well as NFS, iSCSI, NBD, FCoE with the
 dracut-network package.
 
+%description -l pl.UTF-8
+Dracut zawiera narzędzia do tworzenia uruchamialnych obrazów initramfs
+dla jąder Linuksa 2.6. W przeciwieństwie do wcześniejszych
+implementacji, dracut zaszywa możliwie najmniej stałych w initramfs.
+Zawiera różne moduły sterowane w oparciu o zdarzenia udev. Obsługiwane
+jest przechowywanie głównego systemu plików na urządzeniach MD, DM,
+LVM2, LUKS, a po doinstalowaniu pakietu dracut-network także poprzez
+NFS, iSCSI, NBD, FCoE.
+
 %package network
 Summary:	Dracut modules to build a dracut initramfs with network support
+Summary(pl.UTF-8):	Moduły Dracuta do tworzenia initramfs z obsługą sieci
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
 Requires:	bridge-utils
@@ -90,8 +106,14 @@ Suggests:	curl
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
+%description network -l pl.UTF-8
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta zwykłych obrazów initramfs dowolnego przeznaczenia z obsługą
+sieci.
+
 %package fips
 Summary:	Dracut modules to build a dracut initramfs with an integrity check
+Summary(pl.UTF-8):	Moduły Dracuta do tworzenia initramfs z kontrolą spójności
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
 Requires:	hmaccalc
@@ -101,8 +123,14 @@ Requires:	nss-softokn-freebl
 This package requires everything which is needed to build an all
 purpose initramfs with dracut, which does an integrity check.
 
+%description fips -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.
+
 %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}
 
@@ -111,8 +139,14 @@ 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
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
 Requires:	libcap
@@ -121,8 +155,14 @@ Requires:	libcap
 This package requires everything which is needed to build an all
 purpose initramfs with dracut, which drops capabilities.
 
+%description caps -l pl
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta obrazów initramfs dowolnego przeznaczenia zrzucających
+uprawnienia.
+
 %package tools
 Summary:	Dracut tools to build the local initramfs
+Summary(pl.UTF-8):	Narzędzia Dracuta do tworzenia lokalnych initramfs
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
 
@@ -130,25 +170,49 @@ Requires:	%{name} = %{version}-%{release}
 This package contains tools to assemble the local initrd and host
 configuration.
 
+%description tools -l pl.UTF-8
+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
+%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
+find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
-%{__make}
+%{__make} all doc \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
 	$RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	libdir=%{_prefix}/lib \
 	bindir=%{_bindir} \
 	systemdsystemunitdir=%{systemdunitdir} \
@@ -159,18 +223,20 @@ 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
 
 # remove gentoo specific modules
-%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
+%doc AUTHORS HACKING NEWS README* TODO dracut.html dracut.png dracut.svg
 %dir %{_sysconfdir}/dracut.conf.d
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf
@@ -181,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mkinitrd
 %attr(755,root,root) %{_bindir}/lsinitrd
 %dir %{dracutlibdir}
+%attr(755,root,root) %{dracutlibdir}/dracut-install
 %dir %{dracutlibdir}/modules.d
 %attr(755,root,root) %{dracutlibdir}/dracut-functions.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-functions
@@ -190,8 +257,14 @@ 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/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
 %attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh
 %dir %{dracutlibdir}/modules.d/10i18n
@@ -200,6 +273,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
 %dir %{dracutlibdir}/modules.d/30convertfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
+%dir %{dracutlibdir}/modules.d/50drm
+%attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh
 %dir %{dracutlibdir}/modules.d/50plymouth
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
@@ -209,6 +284,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -217,6 +294,7 @@ 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/90kernel-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
 %dir %{dracutlibdir}/modules.d/90lvm
@@ -227,6 +305,8 @@ 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/90qemu
+%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
@@ -276,6 +356,7 @@ rm -rf $RPM_BUILD_ROOT
 %{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
@@ -290,12 +371,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /var/lib/initramfs
 %{systemdunitdir}/*.service
-%{systemdunitdir}/*.target
 %{systemdunitdir}/*/*.service
-%{_mandir}/man8/dracut.8*
+%{_mandir}/man1/lsinitrd.1*
+%{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
-%{_mandir}/man5/dracut.conf.5*
+%{_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/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
 
 %files network
 %defattr(644,root,root,755)
@@ -308,6 +401,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
 %dir %{dracutlibdir}/modules.d/90livenet
 %attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
+%dir %{dracutlibdir}/modules.d/90qemu-net
+%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu-net/*.sh
+%dir %{dracutlibdir}/modules.d/95cifs
+%attr(755,root,root) %{dracutlibdir}/modules.d/95cifs/*.sh
 %dir %{dracutlibdir}/modules.d/95fcoe
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe/*.sh
 %dir %{dracutlibdir}/modules.d/95iscsi
@@ -329,7 +426,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files fips-aesni
 %defattr(644,root,root,755)
-%doc COPYING
 %dir %{dracutlibdir}/modules.d/02fips-aesni
 %attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh
 
@@ -341,8 +437,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(644,root,root,755)
-%{_mandir}/man8/dracut-catimages.8*
 %attr(755,root,root) %{_bindir}/dracut-catimages
+%{_mandir}/man8/dracut-catimages.8*
 %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