From fe149f46779dc2d82f3b9e79f382bb2e49ec982e Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 13 Mar 2003 01:20:27 +0000
Subject: fix conflict

---
 initscripts.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/initscripts.spec b/initscripts.spec
index e2cccf13..04249716 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -17,7 +17,7 @@ Requires: bash >= 2.0, SysVinit
 Requires: /sbin/ip, /sbin/arping, net-tools
 Requires: /etc/redhat-release, dev
 Conflicts: kernel <= 2.4, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
-Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-21
+Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Obsoletes: rhsound sapinit
 Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
 BuildPrereq: glib2-devel popt gettext pkgconfig
-- 
cgit v1.2.1