rpms/initscripts/devel initscripts.spec,1.149,1.150

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24933

Modified Files:
	initscripts.spec 
Log Message:
revert conflict so xen can still install



Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- initscripts.spec	25 Sep 2007 16:44:29 -0000	1.149
+++ initscripts.spec	4 Oct 2007 15:34:18 -0000	1.150
@@ -18,7 +18,7 @@
 Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 078-1
 Requires: popt >= 1.12-2
-Conflicts: mkinitrd < 4.0, kernel < 2.6.23
+Conflicts: mkinitrd < 4.0, kernel < 2.6.12
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 3.0.3-7
 Conflicts: tcsh < 6.13-5
@@ -208,6 +208,8 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+- revert kernel conflict so that xen can still work
+
 * Tue Sep 25 2007 Bill Nottingham <notting at redhat.com> - 8.57-1
 - work around upstream bash changes (#220887, modified from <nvigier at mandriva.com>)
 - init.d/network: add Should-Start for firewall services