From 139c589c4e290c52df5428d70efa6b38fca5a526 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 27 Aug 2004 15:32:19 +0000 Subject: 7.72-1 --- ChangeLog | 12 ++++++++++++ initscripts.spec | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29df0fc0..68205fb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-08-27 Bill Nottingham + + * initscripts.spec, Changelog: 7.72-1 + + * initscripts.spec: + flip the kernel conflict to a Requires: + +2004-08-26 Karsten Hopp + + * initscripts.spec, sysconfig/network-scripts/ifup-ctc, sysconfig/network-scripts/ifup-iucv: + - ifcfg-iucv/ctc: drop REMIP and use GATEWAY instead + 2004-08-26 Bill Nottingham * ChangeLog, initscripts.spec: 7.70-1 diff --git a/initscripts.spec b/initscripts.spec index ec9f7c6e..4e704581 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -16,9 +16,9 @@ Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 2.0, SysVinit Requires: /sbin/ip, /sbin/arping, net-tools Requires: /etc/redhat-release, dev -Requires: ethtool >= 1.8-2 +Requires: ethtool >= 1.8-2, kernel >= 2.6 Conflicts: mkinitrd < 4.0 -Conflicts: kernel <= 2.6, timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3 +Conflicts: timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3 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 @@ -252,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Aug 27 2004 Bill Nottingham 7.72-1 +- flip the kernel conflict to a Requires: + * Thu Aug 26 2004 Karsten Hopp 7.71-1 - ifcfg-iucv/ctc: drop REMIP and use GATEWAY instead -- cgit v1.2.1