X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=2513a7bce70f4623fb8bf12eb74bed2b7d274604;hb=f77a3de7873df5e7dc67a54d7d29335250b03d14;hp=5cc4a87b1f1c1b07d2401ce331d3ec97948c1ca3;hpb=7d909b03a24f3abb910162c814efa14f8d435fee;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 5cc4a87b1..2513a7bce 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -563,7 +563,13 @@ Obsoletes: kernel-smp
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
+#### Planet-Lab ####
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 14
 BuildRequires: net-tools, patchutils, rpm-build >= 4.8.0-7
+%else
+BuildRequires: net-tools, patchutils, rpm-build
+%endif
+#### Planet-Lab ####
 %if %{with_doc}
 BuildRequires: xmlto
 BuildRequires: asciidoc
@@ -1555,16 +1561,14 @@ then\
     /sbin/weak-modules --add-kernel %{KVERREL}%{?1:.%{1}} || exit $?\
 fi\
 %endif\
-# make some useful links
-pushd /boot\
+pushd /boot > /dev/null\
 ln -sf config-%{KVERREL}%{?1:.%{1}} config\
 ln -sf config-%{KVERREL}%{?1:.%{1}} configsmp\
 ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-boot\
 ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-bootsmp\
 ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-boot\
 ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-bootsmp\
-popd\
-# ask for a reboot
+popd > /dev/null\
 mkdir -p /etc/planetlab\
 touch /etc/planetlab/update-reboot\
 %{nil}