From 9a7b23f0259679389eb3ab88dd786f09f35261f9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 29 Oct 2010 16:50:05 +0200 Subject: [PATCH] Revert "removed %if from around BuildRequires" This reverts commit 3c6e927308436322362842e403b24ec8d7d21b94. --- dracut.spec | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dracut.spec b/dracut.spec index f0a8aec..361a231 100644 --- a/dracut.spec +++ b/dracut.spec @@ -20,10 +20,10 @@ Version: 008 Release: %{release_prefix} Summary: Initramfs generator using udev -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 Group: System Environment/Base %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 0 Group: System/Base %endif License: GPLv2+ @@ -33,14 +33,20 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki Source0: dracut-%{version}%{?dashgittag}.tar.bz2 BuildArch: noarch -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif +%if 0%{?fedora_version} > 0 BuildRequires: docbook-style-xsl docbook-dtds libxslt +%endif + +%if 0%{?suse_version} > 0 +BuildRequires: docbook-xsl-stylesheets libxslt +%endif %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 # no "provides", because dracut does not offer @@ -75,14 +81,14 @@ Requires: sed Requires: tar Requires: udev -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 Requires: util-linux-ng >= 2.16 Requires: initscripts >= 8.63-1 Requires: plymouth >= 0.8.0-0.2009.29.09.19.1 Requires: mount %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 0 Requires: util-linux >= 2.16 %endif @@ -104,13 +110,13 @@ Requires: nbd Requires: net-tools iproute Requires: bridge-utils -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 Requires: iscsi-initiator-utils Requires: nfs-utils Requires: dhclient %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 0 Requires: dhcp-client Requires: nfs-client Requires: vlan @@ -122,7 +128,7 @@ Provides: dracut-generic = %{version}-%{release} This package requires everything which is needed to build a generic all purpose initramfs with network support with dracut. -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 %package fips Summary: Dracut modules to build a dracut initramfs with an integrity check Requires: %{name} = %{version}-%{release} @@ -154,7 +160,7 @@ This package contains tools to assemble the local initrd and host configuration. make WITH_SWITCH_ROOT=0%{?with_switch_root} %install -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 rm -rf $RPM_BUILD_ROOT %endif make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \ @@ -176,11 +182,11 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf %endif -%if 0%{?suse_version} +%if 0%{?suse_version} > 0 install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf %endif @@ -207,7 +213,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/dracut/modules.d %{_datadir}/dracut/dracut-functions %config(noreplace) /etc/dracut.conf -%if 0%{?fedora_version} || 0%{?suse_version} +%if 0%{?fedora_version} > 0 || 0%{?suse_version} > 0 %config(noreplace) /etc/dracut.conf.d/01-dist.conf %endif %dir /etc/dracut.conf.d @@ -257,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/45ifcfg %{_datadir}/dracut/modules.d/95znet -%if 0%{?fedora_version} +%if 0%{?fedora_version} > 0 %files fips %defattr(-,root,root,0755) %{_datadir}/dracut/modules.d/01fips