aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-04-24 15:49:09 -0400
committerBill Nottingham <notting@redhat.com>2008-04-24 15:49:09 -0400
commite1f35319bcaa76ce964d24e79a5a0dbece9b4fd8 (patch)
tree6d15b25eccc35f4c1b060c6ba0a5f5cfdf94db0a
parent9f0c9be19a6324b161a699b68fadb4ea2349edc3 (diff)
downloadinitscripts-e1f35319bcaa76ce964d24e79a5a0dbece9b4fd8.tar
initscripts-e1f35319bcaa76ce964d24e79a5a0dbece9b4fd8.tar.gz
initscripts-e1f35319bcaa76ce964d24e79a5a0dbece9b4fd8.tar.bz2
initscripts-e1f35319bcaa76ce964d24e79a5a0dbece9b4fd8.tar.xz
initscripts-e1f35319bcaa76ce964d24e79a5a0dbece9b4fd8.zip
don't install S99single when using upstart
-rw-r--r--initscripts.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 70a04c5c..ffdf3c9c 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,7 @@ 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
%else
mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
%endif
@@ -232,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Thu Apr 24 2008 Bill Nottingham <notting@redhat.com> - 8.72-1
+- don't have a S99single when using upstart (#444001, indirectly)
+
* Wed Apr 23 2008 Bill Nottingham <notting@redhat.com> - 8.71-1
- adjust to gdm using LANG instead of GDM_LANG (#372151, <rstrode@redhat.com>)
- rework netfs' check for networking availability to properly handle both network