dracut-037

1 files changed, 32 insertions, 84 deletions

diff --git a/dracut.spec b/dracut.spec
index 9690ccc..baa1219 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,4 +1,5 @@
 %define dracutlibdir %{_prefix}/lib/dracut
+%bcond_without doc
 
 # Variables must be defined
 %define with_nbd                1
@@ -9,8 +10,8 @@
 %endif
 
 Name: dracut
-Version: 034
-Release: 80.git20140122%{?dist}
+Version: 037
+Release: 1%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -28,86 +29,7 @@ URL: https://dracut.wiki.kernel.org/
 
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
-Patch1: 0001-lvm-install-thin-utils-for-non-hostonly.patch
-Patch2: 0002-module-setup.sh-add-comments-for-dracut-called-funct.patch
-Patch3: 0003-10i18n-parse-i18n.sh-parse-rd.vconsole-and-rd.locale.patch
-Patch4: 0004-dracut.sh-do-not-bail-out-if-kernel-modules-dir-is-m.patch
-Patch5: 0005-Doc-cleanup-extend-and-split-and-reuse.patch
-Patch6: 0006-dmsquash-live-add-dev-mapper-live-base.patch
-Patch7: 0007-base-init.sh-also-mkdir-run-lock.patch
-Patch8: 0008-resume-fix-swap-detection-in-hostonly.patch
-Patch9: 0009-resume-remove-resume-genrules.sh.patch
-Patch10: 0010-Add-lzo-lz4-compression-and-read-INITRD_COMPRESS.patch
-Patch11: 0011-lvm-fix-thin-recognition.patch
-Patch12: 0012-dracut.sh-also-mkdir-run-lock-which-is-copied-to.patch
-Patch13: 0013-dracut.sh-no-need-to-make-subdirs-in-run.patch
-Patch14: 0014-network-fcoe-only-redirect-output-to-loginit.pipe-if.patch
-Patch15: 0015-mkdir-basic-dirs-in-run.patch
-Patch16: 0016-dracut-functions.sh-check_block_and_slaves-skip-LVM-.patch
-Patch17: 0017-kernel-modules-ARM-add-mmc_block-usb_storage-to-stat.patch
-Patch18: 0018-lvm-always-install-thin-utils-for-lvm.patch
-Patch19: 0019-usrmount-module-setup.sh-fixed-typo.patch
-Patch20: 0020-Handle-crypto-modules-with-and-without-modaliases.patch
-Patch21: 0021-fips-include-crct10dif_generic.patch
-Patch22: 0022-iscsi-nbd-do-not-try-to-mount-the-whole-disk-if-root.patch
-Patch23: 0023-dracut.spec-move-sbin-dracut-to-usr-sbin-dracut.patch
-Patch24: 0024-dracut.sh-fixed-PATH-shortener.patch
-Patch25: 0025-dracut.modules.7.asc-removed-empty-section.patch
-Patch26: 0026-fips-also-install-etc-system-fips-in-the-initramfs.patch
-Patch27: 0027-dracut-functions.sh-Avoid-loading-unnecessary-32-bit.patch
-Patch28: 0028-iscsi-nbd-do-not-fail-in-hostonly-mode.patch
-Patch29: 0029-systemd-do-not-exit-the-initqueue-if-systemd-asks-a-.patch
-Patch30: 0030-Run-xz-and-lzma-with-multiple-threads.patch
-Patch31: 0031-kernel-modules-add-ohci-pci-to-the-list-of-forced-mo.patch
-Patch32: 0032-lvm-do-not-run-pvscan-for-lvmetad-update.patch
-Patch33: 0033-fips-fix-RHEV-vmlinuz-check.patch
-Patch34: 0034-dracut.cmdline.7.asc-document-server-ip-of-ip-parame.patch
-Patch35: 0035-dracut.sh-_get_fs_type-if-block-device-exists-return.patch
-Patch36: 0036-network-net-lib.sh-wait_for_if_up-wait-for-state-UP.patch
-Patch37: 0037-network-net-lib.sh-iface_has_link-fixup.patch
-Patch38: 0038-network-ifup.sh-before-doing-dhcp-check-if-the-link-.patch
-Patch39: 0039-base-dracut-lib.sh-wait_for_dev-relax-requirement.patch
-Patch40: 0040-resume-autoconf-resume.patch
-Patch41: 0041-resume-no-more-autoresume.patch
-Patch42: 0042-dracut.sh-skip-crypt-swaps-with-password-files.patch
-Patch43: 0043-dracut-functions.sh-do-not-force-require-modules.bui.patch
-Patch44: 0044-10i18n-parse-i18n.sh-fixed-vconsole.conf-locale.conf.patch
-#Patch45: 0045-95dasd-Install-kernel-modules-only-once.patch
-#Patch46: 0046-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch
-#Patch47: 0047-95dasd_mod-make-dasd_cio_free-optional.patch
-#Patch48: 0048-95zfcp-Make-installation-optional.patch
-#Patch49: 0049-95znet-Make-installation-optional.patch
-#Patch50: 0050-Add-DASD-configuration-for-SuSE.patch
-#Patch51: 0051-Add-zfcp-scripts-for-SUSE.patch
-#Patch52: 0052-Make-logfile-configurable.patch
-#Patch53: 0053-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch
-#Patch54: 0054-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch
-Patch55: 0055-Fixup-keymap-setting-for-openSUSE.patch
-Patch56: 0056-Fixup-script-permissions.patch
-Patch57: 0057-Remove-shebang-from-shell-completion-files.patch
-Patch58: 0058-lvm-install-thin-tools-only-when-needed-in-hostonly.patch
-Patch59: 0059-i18n-introduce-i18n_install_all-to-install-everythin.patch
-#Patch60: 0060-dracut.spec-add-new-modules.patch
-#Patch61: 0061-dracut.spec-remove-suse-man-pages.patch
-#Patch62: 0062-TODO-update.patch
-Patch63: 0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch
-Patch64: 0064-base-rdsosreport.sh-add-ip-a-output.patch
-Patch65: 0065-usrmount-always-install.patch
-Patch66: 0066-fcoe-move-uefi-parsing-to-fcoe-uefi-module.patch
-Patch67: 0067-move-uefi-lib-to-a-seperate-module.patch
-Patch68: 0068-lvm-fixed-lvm-thin-check.patch
-Patch69: 0069-resume-fixed-udev-rule-for-dev-resume-instead-of-dev.patch
-Patch70: 0070-resume-parse-resume.sh-fixed-printf-formatting.patch
-Patch71: 0071-systemd-dracut-initqueue.sh-fstab-is-not-a-directory.patch
-Patch72: 0072-dracut.sh-add-missing-piece-for-option-add-device.patch
-Patch73: 0073-dracut.sh-add-boot-efi-to-device-paths.patch
-Patch74: 0074-kernel-modules-add-more-block-driver.patch
-Patch75: 0075-network-include-usbnet-drivers.patch
-Patch76: 0076-network-include-all-ethernet-drivers.patch
-Patch77: 0077-dracut-install-dracut-fix-ldd-output-parsing.patch
-Patch78: 0078-dracut.spec-add-95fcoe-uefi-and-99uefi-lib.patch
-Patch79: 0079-fcoe-uefi-do-not-include-if-fcoe-utils-not-installed.patch
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
 
 
 BuildRequires: bash git
@@ -125,6 +47,7 @@ BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 %endif
 
+%if %{with doc}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif
@@ -134,6 +57,8 @@ BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif
 
 BuildRequires: asciidoc
+%endif
+
 
 %if 0%{?fedora} > 12 || 0%{?rhel}
 # no "provides", because dracut does not offer
@@ -283,7 +208,10 @@ git am -p1 %{patches}
 %endif
 
 %build
-%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib
+%configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) --libdir=%{_prefix}/lib \
+%if %{without doc}
+     --disable-documentation
+%endif
 
 make %{?_smp_mflags}
 
@@ -365,7 +293,9 @@ rm -rf -- $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
+%if %{with doc}
 %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
+%endif
 %{_bindir}/dracut
 # compat symlink
 %{_sbindir}/dracut
@@ -383,12 +313,15 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %{dracutlibdir}/dracut-install
+%{dracutlibdir}/skipcpio
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %{dracutlibdir}/dracut.conf.d/01-dist.conf
 %endif
 %dir %{_sysconfdir}/dracut.conf.d
 %dir %{dracutlibdir}/dracut.conf.d
+
+%if %{with doc}
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/*service.8*
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
@@ -400,6 +333,8 @@ rm -rf -- $RPM_BUILD_ROOT
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man7/dracut.bootup.7*
 %{_mandir}/man5/dracut.conf.5*
+%endif
+
 %if %{defined _unitdir}
 %{dracutlibdir}/modules.d/00systemd-bootchart
 %else
@@ -433,8 +368,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95rootfs-block
 %{dracutlibdir}/modules.d/95dasd
 %{dracutlibdir}/modules.d/95dasd_mod
+%{dracutlibdir}/modules.d/95dasd_rules
 %{dracutlibdir}/modules.d/95fstab-sys
 %{dracutlibdir}/modules.d/95zfcp
+%{dracutlibdir}/modules.d/95zfcp_rules
 %{dracutlibdir}/modules.d/95terminfo
 %{dracutlibdir}/modules.d/95udev-rules
 %{dracutlibdir}/modules.d/95virtfs
@@ -505,7 +442,11 @@ rm -rf -- $RPM_BUILD_ROOT
 
 %files fips-aesni
 %defattr(-,root,root,0755)
+
+%if %{with doc}
 %doc COPYING
+%endif
+
 %{dracutlibdir}/modules.d/02fips-aesni
 
 %files caps
@@ -514,7 +455,11 @@ rm -rf -- $RPM_BUILD_ROOT
 
 %files tools
 %defattr(-,root,root,0755)
-%{_mandir}/man8/dracut-catimages.8*
+
+%if %{with doc}
+%doc %{_mandir}/man8/dracut-catimages.8*
+%endif
+
 %{_bindir}/dracut-catimages
 %dir /boot/dracut
 %dir /var/lib/dracut
@@ -533,6 +478,9 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-1
+- version 037
+
 * Wed Jan 22 2014 Harald Hoyer <harald@redhat.com> 034-80.git20140122
 - fixed /dev/dev/resume
 Resolves: rhbz#1045116