From 0a4ac90a7427b5b399c340fc860fdda8a5907196 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 22 Sep 2004 17:07:09 +0000 Subject: [PATCH] auto-import initscripts-7.83-1 on branch devel from initscripts-7.83-1.src.rpm --- .cvsignore | 2 +- initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1f45c4b..dcf1cab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-7.82.tar.bz2 +initscripts-7.83.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index b7c9b11..129129c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.82 +Version: 7.83 License: GPL Group: System Environment/Base Release: 1 @@ -20,6 +20,7 @@ Requires: ethtool >= 1.8-2, kernel >= 2.6, /sbin/nash Conflicts: mkinitrd < 4.0 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 +Conflicts: udev < 0:032 Obsoletes: rhsound sapinit Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils BuildPrereq: glib2-devel popt gettext pkgconfig @@ -205,6 +206,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Sep 22 2004 Jeremy Katz - 7.83-1 +- conflict with old udev +- use udev if it's present + * Fri Sep 17 2004 Bill Nottingham - 7.82-1 - fix handling of nonexistent devices (#132839) - rhgb enhancements (, #132665) diff --git a/sources b/sources index 5462def..fe796dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e12f53f461a96163aee79772817d013 initscripts-7.82.tar.bz2 +5c2d2b9d2b2bf5720dbaf0b101e4d981 initscripts-7.83.tar.bz2