rpms/kernel/devel kernel-2.6.spec,1.2670.2.2,1.2670.2.3

[fedora-cvs-commits at redhat.com]

Author: jmoyer

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

Modified Files:
      Tag: private-jmoyer-dio-testing-branch
	kernel-2.6.spec 
Log Message:
- The relocatable kernel patch was failed to apply in brew;  disabled.
- also disable the building of xen.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2670.2.2
retrieving revision 1.2670.2.3
diff -u -r1.2670.2.2 -r1.2670.2.3
--- kernel-2.6.spec	19 Sep 2006 22:09:36 -0000	1.2670.2.2
+++ kernel-2.6.spec	20 Sep 2006 15:16:51 -0000	1.2670.2.3
@@ -9,7 +9,7 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
 %define builddoc 0
 %define buildkdump 1
 %define buildheaders 1
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.dio.1
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.dio.2
 %define signmodules 0
 %define xen_hv_cset 11470
 %define make_target bzImage
@@ -1128,11 +1128,12 @@
 #
 %patch10000 -p1
 
-%if 0%{?rhel}
+%if 0
 #add in support for x86 and x86_64 relocatable kernels
 %patch210 -p1
 #xen fix for x86 relocatable support
 %patch957 -p1
+%endif
 
 %patch30000 -p1
 %patch30001 -p1
@@ -1140,8 +1141,6 @@
 %patch30003 -p1
 %patch30004 -p1
 
-%endif
-
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1902,6 +1901,9 @@
 %endif
 
 %changelog
+* Wed Sep 20 2006 Jeff Moyer <jmoyer at redhat.com>
+- The relocatable kernel patch was failed to apply in brew;  disabled.
+
 * Mon Sep 18 2006 Jeff Moyer <jmoyer at redhat.com>
 - DIO error path cleanup (Zach Brown)