rpms/ConsoleKit/devel ConsoleKit-0.4.1-upstart06.patch, NONE, 1.1 ConsoleKit.spec, 1.49, 1.50

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	ConsoleKit.spec 
Added Files:
	ConsoleKit-0.4.1-upstart06.patch 
Log Message:
Adjust for upstart 0.6.x.

Job files go in /etc/init, and must end in .conf.

Since service jobs (i.e., jobs that respawn) are now the default, mark
these jobs with 'task'.


ConsoleKit-0.4.1-upstart06.patch:
 ck-log-system-restart      |    8 --------
 ck-log-system-restart.conf |    8 ++++++++
 ck-log-system-start        |    8 --------
 ck-log-system-start.conf   |    8 ++++++++
 ck-log-system-stop         |    8 --------
 ck-log-system-stop.conf    |    8 ++++++++
 6 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE ConsoleKit-0.4.1-upstart06.patch ---
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-restart ConsoleKit-0.4.1-new/data/ck-log-system-restart
--- ConsoleKit-0.4.1/data/ck-log-system-restart	2009-04-29 15:07:29.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-restart	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-restart - write system restart to log
-#
-
-start on runlevel 6
-
-console output
-exec /usr/sbin/ck-log-system-restart
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-restart.conf ConsoleKit-0.4.1-new/data/ck-log-system-restart.conf
--- ConsoleKit-0.4.1/data/ck-log-system-restart.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-restart.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-restart - write system restart to log
+#
+
+start on runlevel 6
+
+task
+exec /usr/sbin/ck-log-system-restart
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-start ConsoleKit-0.4.1-new/data/ck-log-system-start
--- ConsoleKit-0.4.1/data/ck-log-system-start	2009-07-29 20:29:51.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-start	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-start - write system start to log
-#
-
-start on stopped rcS
-
-console output
-exec /usr/sbin/ck-log-system-start
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-start.conf ConsoleKit-0.4.1-new/data/ck-log-system-start.conf
--- ConsoleKit-0.4.1/data/ck-log-system-start.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-start.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-start - write system start to log
+#
+
+start on stopped rcS
+
+task
+exec /usr/sbin/ck-log-system-start
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-stop ConsoleKit-0.4.1-new/data/ck-log-system-stop
--- ConsoleKit-0.4.1/data/ck-log-system-stop	2009-04-29 15:07:29.000000000 -0400
+++ ConsoleKit-0.4.1-new/data/ck-log-system-stop	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-# Upstart event
-# ck-log-system-stop - write system stop to log
-#
-
-start on runlevel 0
-
-console output
-exec /usr/sbin/ck-log-system-stop
diff -ruN ConsoleKit-0.4.1/data/ck-log-system-stop.conf ConsoleKit-0.4.1-new/data/ck-log-system-stop.conf
--- ConsoleKit-0.4.1/data/ck-log-system-stop.conf	1969-12-31 18:00:00.000000000 -0600
+++ ConsoleKit-0.4.1-new/data/ck-log-system-stop.conf	2009-12-09 17:20:45.000000000 -0500
@@ -0,0 +1,8 @@
+# Upstart event
+# ck-log-system-stop - write system stop to log
+#
+
+start on runlevel 0
+
+task
+exec /usr/sbin/ck-log-system-stop


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/extras/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ConsoleKit.spec	29 Sep 2009 15:46:00 -0000	1.49
+++ ConsoleKit.spec	9 Dec 2009 22:25:37 -0000	1.50
@@ -6,14 +6,16 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 Source0: http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-%{version}.tar.bz2
+Patch0: ConsoleKit-0.4.1-upstart06.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
+Conflicts: upstart < 0.6.0
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -79,6 +81,7 @@ This package contains developer document
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -98,8 +101,8 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/security/*
 rm -f $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit/history
 
 # The sample upstart files are good enough for us.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d
-cp data/ck-log-system-{start,stop,restart} $RPM_BUILD_ROOT%{_sysconfdir}/event.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init
+cp data/ck-log-system-{start,stop,restart}.conf $RPM_BUILD_ROOT%{_sysconfdir}/init
 
 cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
@@ -119,7 +122,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
-%config(noreplace) %{_sysconfdir}/event.d/*
+%config(noreplace) %{_sysconfdir}/init/*
 %{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/polkit-1/actions/*.policy
 %dir %{_sysconfdir}/ConsoleKit
@@ -166,6 +169,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> 0.4.1-2
+- Adjust for upstart 0.6
+
 * Tue Sep 29 2009 Jon McCann <jmccann at redhat.com> 0.4.1-1
 - Update to 0.4.1