From a4c36ce155f06c40e4e9d9faf0b84726161b9f3f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Oct 29 2010 14:52:23 +0000 Subject: - fixed rpm macros --- diff --git a/dracut.spec b/dracut.spec index 0220703..6fdcb94 100644 --- a/dracut.spec +++ b/dracut.spec @@ -16,14 +16,14 @@ Name: dracut Version: 008 -%define release_prefix 0.5%{?rdist} +%define release_prefix 0.6%{?rdist} Release: %{release_prefix} Summary: Initramfs generator using udev -%if 0%{?fedora} > 0 +%if 0%{?fedora} Group: System Environment/Base %endif -%if 0%{?suse_version} > 0 +%if 0%{?suse_version} Group: System/Base %endif License: GPLv2+ @@ -33,18 +33,18 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki Source0: dracut-%{version}%{?dashgittag}.tar.bz2 BuildArch: noarch -%if 0%{?fedora} > 0 +%if 0%{?fedora} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -%if 0%{?suse_version} > 0 +%if 0%{?suse_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif -%if 0%{?fedora} > 0 +%if 0%{?fedora} BuildRequires: docbook-style-xsl docbook-dtds libxslt %endif -%if 0%{?suse_version} > 0 +%if 0%{?suse_version} BuildRequires: docbook-xsl-stylesheets libxslt %endif @@ -81,14 +81,14 @@ Requires: sed Requires: tar Requires: udev -%if 0%{?fedora} > 0 +%if 0%{?fedora} 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} > 0 +%if 0%{?suse_version} Requires: util-linux >= 2.16 %endif @@ -110,13 +110,13 @@ Requires: nbd Requires: net-tools iproute Requires: bridge-utils -%if 0%{?fedora} > 0 +%if 0%{?fedora} Requires: iscsi-initiator-utils Requires: nfs-utils Requires: dhclient %endif -%if 0%{?suse_version} > 0 +%if 0%{?suse_version} Requires: dhcp-client Requires: nfs-client Requires: vlan @@ -128,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} > 0 +%if 0%{?fedora} %package fips Summary: Dracut modules to build a dracut initramfs with an integrity check Requires: %{name} = %{version}-%{release} @@ -160,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} > 0 +%if 0%{?fedora} rm -rf $RPM_BUILD_ROOT %endif make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \ @@ -182,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} > 0 +%if 0%{?fedora} install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf %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 %endif @@ -213,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} > 0 || 0%{?suse_version} > 0 +%if 0%{?fedora} || 0%{?suse_version} %config(noreplace) /etc/dracut.conf.d/01-dist.conf %endif %dir /etc/dracut.conf.d @@ -263,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/45ifcfg %{_datadir}/dracut/modules.d/95znet -%if 0%{?fedora} > 0 +%if 0%{?fedora} %files fips %defattr(-,root,root,0755) %{_datadir}/dracut/modules.d/01fips @@ -280,6 +280,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Fri Oct 29 2010 Harald Hoyer 008-0.6%{?rdist} +- fixed rpm macros + * Fri Oct 29 2010 Harald Hoyer 008-0.5 - dracut-008 pre git snapshot