[upstart/f14] /etc/init.conf, upstart-1.2-2.fc14

[Petr Lautrbach]

commit 2e986918464f95c7ca6127ca7b5660028dcd7f14
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Wed May 11 14:07:19 2011 +0200

    /etc/init.conf, upstart-1.2-2.fc14

 upstart.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/init.conf b/init.conf
new file mode 100644
index 0000000..e69de29
diff --git a/upstart.spec b/upstart.spec
index 6100c3e..83a950e 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -8,6 +8,7 @@ License:        GPLv2 and LGPLv2+
 URL:            https://launchpad.net/upstart
 Source0:        http://launchpad.net/upstart/1.x/%{version}/+download/upstart-%{version}.tar.gz
 Source1:        init-system-dbus.conf
+Source2:        init.conf
 Patch1:         upstart-telinit.patch
 Patch2:         upstart-audit-events.patch
 # set DEAD_PROCESS for dead process with pid in utmp table (#572199, #632568)
@@ -79,6 +80,7 @@ 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/
+install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/init.conf
 
 %find_lang %{name}
 
@@ -104,6 +106,7 @@ rm -rf %{buildroot}
 %doc TODO
 %doc HACKING
 %{_sysconfdir}/init/
+%config(noreplace) %{_sysconfdir}/init.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/Upstart.conf
 %dir /lib/upstart
 /lib/upstart/halt
@@ -156,6 +159,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Wed May 11 2011 Petr Lautrbach <plautrba at redhat.com> 1.2-2
+- add /etc/init.conf file
+
 * Mon May 09 2011 Petr Lautrbach <plautrba at redhat.com> 1.2-1
 - upgrade to 1.2
 - allow job override files