[upstart] Add in basic boot jobs. (#637099)

[Bill Nottingham]

commit dd3667fd150fe066b3446af4b3c2a821bf6494e3
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Sep 24 13:13:09 2010 -0400

    Add in basic boot jobs. (#637099)

 .gitignore   |    1 +
 sources      |    1 +
 upstart.spec |   13 +++++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c1b28b..c70584d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 upstart-0.6.5.tar.gz
+/initjobs.tar.gz
diff --git a/sources b/sources
index 46ac626..104e863 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 f9466bba72b655c2408353b64105853f  upstart-0.6.5.tar.gz
+972676df8c1f67d9b2761a1fb02d170f  initjobs.tar.gz
diff --git a/upstart.spec b/upstart.spec
index 030eff1..c807fdc 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.6.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -8,6 +8,8 @@ License:        GPLv2 and LGPLv2+
 URL:            http://upstart.ubuntu.com
 Source0:        http://upstart.ubuntu.com/download/0.6/upstart-%{version}.tar.gz
 Source1:        init-system-dbus.conf
+# These are taken from http://git.fedorahosted.org/git/?p=initscripts.git
+Source2:	initjobs.tar.gz
 Patch1:         upstart-telinit.patch
 Patch2:         upstart-audit-events.patch
 # set DEAD_PROCESS for dead process with pid in utmp table (#572199, #632568)
@@ -39,7 +41,7 @@ Conflicts:      systemd-sysvinit
 Drop-in replacement for the System V init tools, provided by Upstart.
 
 %prep
-%setup -q
+%setup -q -a 2
 %patch1 -p1 -b .u
 %patch2 -p1 -b .audit
 %patch3 -p1 -b .utmp
@@ -79,6 +81,10 @@ ln -sf ../lib/upstart/telinit %{buildroot}/sbin/telinit
 # don't ship default jobs
 rm -f %{buildroot}/%{_sysconfdir}/init/*
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init/
+for file in initjobs/*.conf ; do
+	install -m 644 $file %{buildroot}/%{_sysconfdir}/init/$file
+done
+
 
 %find_lang %{name}
 
@@ -156,6 +162,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Fri Sep 24 2010 Bill Nottingham <notting at redhat.com> 0.6.5-10
+- merge in basic boot jobs here (#637099)
+
 * Tue Sep 21 2010 Petr Lautrbach <plautrba at redhat.com> 0.6.5-9
 - set DEAD_PROCESS for dead process with pid in utmp table (#572199, #632568)
 - exit shutdown with nonzero exitcode when fails shutdown