rpms/kernel-xen/devel kernel-xen.spec,1.50,1.51

[fedora-cvs-commits at redhat.com]

Author: katzj

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

Modified Files:
	kernel-xen.spec 
Log Message:
really commit the conflict


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	8 Feb 2006 21:06:58 -0000	1.50
+++ kernel-xen.spec	8 Feb 2006 21:14:16 -0000	1.51
@@ -145,7 +145,7 @@
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
 #
-%define xen_conflicts glibc < 2.3.5-1
+%define xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
 #
 # Packages that need to be installed before the kernel is, because the %post