rpms/kernel-xen-2.6/devel kernel-xen.spec,1.45,1.46

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24521

Modified Files:
	kernel-xen.spec 
Log Message:
Use %if %{includexen} around xen-specific patches

This should make easier to get a non-xen tree for testing.



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kernel-xen.spec	9 Aug 2007 21:52:39 -0000	1.45
+++ kernel-xen.spec	20 Aug 2007 19:41:21 -0000	1.46
@@ -1006,8 +1006,10 @@
 %patch202 -p1
 # Suppress APIC errors on UP x86-64.
 %patch203 -p1
+%if %{includexen}
 # Suppress APIC errors on UP x86-64 (xen bits)
 %patch204 -p1
+%endif
 # Don't delete cpu_devs data to identify different x86 types in late_initcall
 %patch205 -p1
 # quirk for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller
@@ -1203,8 +1205,10 @@
 # fix oops in sysfs_readdir
 %patch1670 -p1
 
+%if %{includexen}
 # checksum fixes (bug #223258)
 %patch1665 -p1
+%endif
 
 # Align kernel data segment to page boundary.
 %patch1690 -p1
@@ -1242,8 +1246,11 @@
 %patch1794 -p1
 # Work around sysfs/uevent use-after-free problems with Bluetooth HID
 %patch1795 -p1
+
+%if %{includexen}
 # Xenoprof's DOMAIN_SWITCH_CODE changed in oprofile 0.9.3
 %patch1796 -p1
+%endif
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1