From 823d66f09aa4d8300dc3001728afa888bbb67aaf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 4 Sep 2009 14:23:50 -0400 Subject: Tweak kernel conflict. We'll be getting a kernel fix that lets us determine whether the kernel set the clock at runtime; relax the conflict in the meantime. 2.6.12 seems low, though. --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index ba3c66d1..16f0da5b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: popt >= 1.12-2 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 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 -- cgit v1.2.1