From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Fri, 17 Dec 2010 18:13:51 +0000 (-0500)
Subject: Merge branch 'rhel6' of ssh://git.planet-lab.org/git/linux-2.6 into rhel6
X-Git-Tag: linux-2.6-32-4~1
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=899a87c65cb708a36ca5570cb496550017b0883b;hp=cee8a8ed81bbe946608a7e5f3f77feb49a342655

Merge branch 'rhel6' of ssh://git.planet-lab.org/git/linux-2.6 into rhel6
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index edd99ec44..51df7fdcc 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