From 2be1f54a4dae766fff878ae3b7c6104b44ec2f4e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Apr 2008 19:57:11 +0000 Subject: [PATCH] 8.72-1 --- .cvsignore | 2 +- initscripts.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ab2c53..65549a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.71.tar.bz2 +initscripts-8.72.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 70a04c5..61d47e0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.71 +Version: 8.72 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,7 +17,7 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart, event-compat-sysv +Requires: upstart, event-compat-sysv >= 0.3.9-14 %else Requires: SysVinit >= 2.85-38 %endif @@ -60,6 +60,8 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %if with_upstart mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab + rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single + rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab %endif @@ -232,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Apr 24 2008 Bill Nottingham - 8.72-1 +- don't have a S99single when using upstart (#444001, indirectly) + * Wed Apr 23 2008 Bill Nottingham - 8.71-1 - adjust to gdm using LANG instead of GDM_LANG (#372151, ) - rework netfs' check for networking availability to properly handle both network diff --git a/sources b/sources index 28e1b4d..4f10d1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d93f6d611791b23ff857e6aa7289ff6 initscripts-8.71.tar.bz2 +edeaa62a30870f3f9dd3c6800c0ca0fd initscripts-8.72.tar.bz2