removed %if from around BuildRequires

This commit is contained in:
Harald Hoyer 2010-10-29 16:44:52 +02:00
parent 819af3b138
commit 3c6e927308
1 changed files with 14 additions and 20 deletions

View File

@ -20,10 +20,10 @@ Version: 008
Release: %{release_prefix} Release: %{release_prefix}
Summary: Initramfs generator using udev Summary: Initramfs generator using udev
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
Group: System Environment/Base Group: System Environment/Base
%endif %endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version}
Group: System/Base Group: System/Base
%endif %endif
License: GPLv2+ License: GPLv2+
@ -33,20 +33,14 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki
Source0: dracut-%{version}%{?dashgittag}.tar.bz2 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
BuildArch: noarch BuildArch: noarch
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif %endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif %endif
%if 0%{?fedora_version} > 0
BuildRequires: docbook-style-xsl docbook-dtds libxslt 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 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6
# no "provides", because dracut does not offer # no "provides", because dracut does not offer
@ -81,14 +75,14 @@ Requires: sed
Requires: tar Requires: tar
Requires: udev Requires: udev
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
Requires: util-linux-ng >= 2.16 Requires: util-linux-ng >= 2.16
Requires: initscripts >= 8.63-1 Requires: initscripts >= 8.63-1
Requires: plymouth >= 0.8.0-0.2009.29.09.19.1 Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
Requires: mount Requires: mount
%endif %endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version}
Requires: util-linux >= 2.16 Requires: util-linux >= 2.16
%endif %endif
@ -110,13 +104,13 @@ Requires: nbd
Requires: net-tools iproute Requires: net-tools iproute
Requires: bridge-utils Requires: bridge-utils
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
Requires: iscsi-initiator-utils Requires: iscsi-initiator-utils
Requires: nfs-utils Requires: nfs-utils
Requires: dhclient Requires: dhclient
%endif %endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version}
Requires: dhcp-client Requires: dhcp-client
Requires: nfs-client Requires: nfs-client
Requires: vlan Requires: vlan
@ -128,7 +122,7 @@ Provides: dracut-generic = %{version}-%{release}
This package requires everything which is needed to build a generic This package requires everything which is needed to build a generic
all purpose initramfs with network support with dracut. all purpose initramfs with network support with dracut.
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
%package fips %package fips
Summary: Dracut modules to build a dracut initramfs with an integrity check Summary: Dracut modules to build a dracut initramfs with an integrity check
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -160,7 +154,7 @@ This package contains tools to assemble the local initrd and host configuration.
make WITH_SWITCH_ROOT=0%{?with_switch_root} make WITH_SWITCH_ROOT=0%{?with_switch_root}
%install %install
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%endif %endif
make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
@ -182,11 +176,11 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
%endif %endif
%if 0%{?suse_version} > 0 %if 0%{?suse_version}
install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
%endif %endif
@ -213,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/dracut/modules.d %dir %{_datadir}/dracut/modules.d
%{_datadir}/dracut/dracut-functions %{_datadir}/dracut/dracut-functions
%config(noreplace) /etc/dracut.conf %config(noreplace) /etc/dracut.conf
%if 0%{?fedora_version} > 0 || 0%{?suse_version} > 0 %if 0%{?fedora_version} || 0%{?suse_version}
%config(noreplace) /etc/dracut.conf.d/01-dist.conf %config(noreplace) /etc/dracut.conf.d/01-dist.conf
%endif %endif
%dir /etc/dracut.conf.d %dir /etc/dracut.conf.d
@ -263,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dracut/modules.d/45ifcfg %{_datadir}/dracut/modules.d/45ifcfg
%{_datadir}/dracut/modules.d/95znet %{_datadir}/dracut/modules.d/95znet
%if 0%{?fedora_version} > 0 %if 0%{?fedora_version}
%files fips %files fips
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%{_datadir}/dracut/modules.d/01fips %{_datadir}/dracut/modules.d/01fips