X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=8d192df25865991efead34b596df42bda6c52424;hb=HEAD;hp=c968d01a5883ec3329fc85498420dc97ca475085;hpb=db82c8b674adabc0f29cf74fe794b1b6ca8d2841;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index c968d01a5..8d192df25 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,15 +10,11 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 31
+%define taglevel 36
 
 %define sublevel 32
 
-%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
 %define modern_distro 1
-%else
-%define modern_distro 0
-%endif
 #### Planet-Lab ####
 
 Summary: The Linux kernel
@@ -662,6 +658,7 @@ Source82: config-generic
 Source83: config-x86_64-debug-rhel
 
 Patch0: linux-2.6-001-bcm5720.patch
+Patch20001: linux-2.6-002-divide-by-zero-fix.patch
 Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
 Patch3: linux-2.6-250-ipsets.patch
@@ -981,6 +978,7 @@ make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
 ApplyPatch linux-2.6-001-bcm5720.patch
+ApplyPatch linux-2.6-002-divide-by-zero-fix.patch
 ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
 ApplyPatch linux-2.6-250-ipsets.patch
@@ -1795,6 +1793,19 @@ fi
 %endif
 
 %changelog
+* Tue Sep 04 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-36
+- fix filename in specfile - 2.6-35 was broken
+
+* Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-35
+
+* Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-34
+
+* Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-33
+- More compiletime fixes.
+
+* Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-32
+- Fixed some parantheses.
+
 * Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-31
 - For some reason the -30 tag did not get created in Linux-2.6. Might be because of a temporary problem with the git
 - server.