rpms/kernel/FC-6 kernel-2.6.spec, 1.2965, 1.2966 linux-2.6-x86_64-vdso.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv2543

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-x86_64-vdso.patch 
Log Message:
Remove the vdso patch from F6


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2965
retrieving revision 1.2966
diff -u -r1.2965 -r1.2966
--- kernel-2.6.spec	10 Jul 2007 16:12:08 -0000	1.2965
+++ kernel-2.6.spec	10 Jul 2007 16:15:47 -0000	1.2966
@@ -19,7 +19,7 @@
 # setup, we set fedora_cvs_origin to the current cvs revision s/1.// of the
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
-%define fedora_cvs_origin 2963
+%define fedora_cvs_origin 2965
 %define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -42,9 +42,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-#%define rcrev 0
+%define rcrev 0
 # The git snapshot level
-#%define gitrev 0
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -496,7 +496,6 @@
 Patch40: linux-2.6-x86-tune-generic.patch
 Patch50: linux-2.6-x86-vga-vidfail.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
-Patch71: linux-2.6-x86_64-vdso.patch
 Patch95: linux-2.6-kvm-suspend.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -997,8 +996,6 @@
 ApplyPatch linux-2.6-x86-vga-vidfail.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
-# Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu
-ApplyPatch linux-2.6-x86_64-vdso.patch
 # patch to fix suspend with kvm loaded and guests running
 ApplyPatch linux-2.6-kvm-suspend.patch
 


--- linux-2.6-x86_64-vdso.patch DELETED ---