diff options
author | Bill Nottingham <notting@redhat.com> | 2003-03-13 01:20:27 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2003-03-13 01:20:27 +0000 |
commit | fe149f46779dc2d82f3b9e79f382bb2e49ec982e (patch) | |
tree | 70ada67fbeaeaed44b024648de03964192cbd27d | |
parent | 9e3bccf1d0671f2164510690a88e5b5d3eec2da1 (diff) | |
download | initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.gz initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.bz2 initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.tar.xz initscripts-fe149f46779dc2d82f3b9e79f382bb2e49ec982e.zip |
fix conflict
-rw-r--r-- | initscripts.spec | 2 |
1 files changed, 1 insertions, 1 deletions
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 |