Bring all patches up to speed

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6f21d28..4a3c980 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -29,7 +29,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 50
+%define taglevel 33
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -49,6 +49,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define vini_pl_patch 561
 
 %define requiresreboot 0
+%define release vs%{vsversion}.%{taglevel}.mlab%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define packagerelease %{kernelrelease}
@@ -159,6 +160,7 @@ Patch010: linux-2.6-010-e1000e.patch
 Patch015: linux-2.6-015-igb.patch
 Patch017: linux-2.6-017-bnx2.patch
 Patch020: linux-2.6-020-build-id.patch
+Patch021: linux-2.6-021-bcm.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
 Patch050: linux-2.6-050-getline.patch
@@ -204,7 +206,6 @@ Patch660: linux-2.6-660-nmi-watchdog-default.patch
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 Patch670: linux-2.6-670-gcc43.patch
 %endif
-Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
@@ -401,6 +402,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 15
 %ApplyPatch 17
 %ApplyPatch 20
+%ApplyPatch 21
 
 # NetNS patch for VINI
 %if 0%{?with_netns}
@@ -449,7 +451,7 @@ KERNEL_PREVIOUS=vanilla
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 %ApplyPatch 670
 %endif
-%ApplyPatch 680
+%ApplyPatch 690
 %ApplyPatch 700
 %ApplyPatch 710
 %ApplyPatch 720