From b012c93a5b8d67f32b69d7079b27c57702306e0c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 17 Sep 2010 14:08:50 -0400
Subject: [PATCH] 9.21-1

---
 .gitignore       |  1 +
 initscripts.spec | 16 ++++++++++++++--
 sources          |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37f0830..47e54b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ initscripts-9.16.tar.bz2
 /initscripts-9.18.tar.bz2
 /initscripts-9.19.tar.bz2
 /initscripts-9.20.tar.bz2
+/initscripts-9.21.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index 70315b1..dc5affc 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,10 +1,10 @@
-%define _with_upstart 1
+%define _with_upstart 0
 %define _with_systemd 1
 %define _with_sysvinit 0
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.20
+Version: 9.21
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -23,10 +23,16 @@ Requires: sysvinit-tools >= 2.87-5
 Requires: sysvinit-userspace
 %if %{_with_upstart}
 Conflicts: upstart < 0.6.0
+%if ! %{_with_systemd}
+Requires: upstart-sysvinit
+%endif
 %endif
 %if %{_with_systemd}
 Conflicts: systemd < 9-3
 Conflicts: systemd-units < 9-3
+%if ! %{_with_upstart}
+Requires: systemd-sysvinit
+%endif
 %endif
 %if %{_with_sysvinit}
 Requires: SysVinit >= 2.85-38
@@ -275,6 +281,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Seo 17 2010 Bill Nottingham <notting@redhat.com> - 9.21-1
+- build for systemd only
+- ship a default.target link in case the one in /etc gets deleted
+- rc.sysinit: reset btmp on boot if necessary (#633768, <dmach@redhat.com>)
+- single.service: fix invocation so that 'runlevel' works (#630914)
+
 * Thu Sep  9 2010 Bill Nottingham <notting@redhat.com> - 9.20-1
 - use new pidof -m option to avoid false positives (#632321)
 - systemd/single: set $HOME for single-user mode. (#631590)
diff --git a/sources b/sources
index 060eb04..700e647 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf2b07f0f83e00ca3ed08cbb47f033c2  initscripts-9.20.tar.bz2
+8cf6803cff6c1b5875acb00aeaf7620e  initscripts-9.21.tar.bz2