Resolved conflict with kernel version string.

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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6f21d28..3244be6 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -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}
@@ -204,7 +205,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
@@ -449,7 +449,7 @@ KERNEL_PREVIOUS=vanilla
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 %ApplyPatch 670
 %endif
-%ApplyPatch 680
+%ApplyPatch 690
 %ApplyPatch 700
 %ApplyPatch 710
 %ApplyPatch 720