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=-c

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

899a87c65cb708a36ca5570cb496550017b0883b
diff --combined kernel-2.6.spec
index 2513a7bce,edd99ec44..51df7fdcc
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@@ -10,7 -10,7 +10,7 @@@ URL: %(echo %{url} | cut -d ' ' -f 2
  
  %define name linux-2.6
  %define module_version_varname sublevel
- %define taglevel 2
+ %define taglevel 3
  
  %define sublevel 32
  #### Planet-Lab ####
@@@ -563,13 -563,7 +563,13 @@@ Obsoletes: kernel-sm
  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
@@@ -1771,6 -1765,11 +1771,11 @@@ f
  %endif
  
  %changelog
+ * Thu Dec 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-3
+ - Tweak vserver configs based on Daniel's suggestions
+ - Add appropriate postinstall steps required by PL nodes
+ - Tweak dependencies for F8 compatibility
+ 
  * Fri Dec 10 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-2
  - Fix F14 build problems