rpms/olpc-utils/devel olpc-utils-1.0.13-upstart06.patch, NONE, 1.1 olpc-utils.spec, 1.22, 1.23

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/olpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17222

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-1.0.13-upstart06.patch 
Log Message:
Adjust for upstart 0.6.

Job files moved to /etc/init, and must end in .conf.
We rearranged how we do runlevels slightly, and jobs can only have
one 'start on' or 'stop on' line.


olpc-utils-1.0.13-upstart06.patch:
 ttyS0 |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE olpc-utils-1.0.13-upstart06.patch ---
diff -up olpc-utils-1.0.13/etc/event.d/ttyS0.new olpc-utils-1.0.13/etc/event.d/ttyS0
--- olpc-utils-1.0.13/etc/event.d/ttyS0.new	2009-12-09 16:59:32.000000000 -0500
+++ olpc-utils-1.0.13/etc/event.d/ttyS0	2009-12-09 16:59:38.000000000 -0500
@@ -1,14 +1,9 @@
 # ttyS0
 
-start on stopped rc2
-start on stopped rc3
-start on stopped rc4
-start on started prefdm
+start on stopped rc RUNLEVEL=[2345]
 
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 6
+stop on runlevel [016]
 
 respawn
-exec agetty -L -l /bin/bash -w -n ttyS0 115200 vt100
+exec /sbin/agetty -L -l /bin/bash -w -n ttyS0 115200 vt100
 


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- olpc-utils.spec	4 Dec 2009 11:35:33 -0000	1.22
+++ olpc-utils.spec	9 Dec 2009 22:05:57 -0000	1.23
@@ -1,11 +1,12 @@
 Name:       olpc-utils
 Version:    1.0.13
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
 License:    GPLv2+
 Source0:    %{name}-%{version}.tar.bz2
+Patch:      olpc-utils-1.0.13-upstart06.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # for olpc-dm
@@ -19,6 +20,9 @@ Requires:   /usr/bin/find
 #comment out for the moment as olpcupdate isn't in Fedora mainline
 #Requires:   olpcupdate >= 2.10
 
+# for new event location
+Conflicts: upstart < 0.6.0
+
 %description
 
 Tools for starting an X session, mapping keys on the OLPC keyboards,
@@ -26,7 +30,7 @@ becoming root, and cleaning the datastor
 
 %prep
 %setup -q
-
+%patch -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -36,6 +40,9 @@ make -f Makefile.build %{?_smp_mflags} C
 rm -rf %{buildroot}
 make -f Makefile.build install DESTDIR=%{buildroot}
 
+mkdir -p %{buildroot}/%{_sysconfdir}/init
+mv %{buildroot}/%{_sysconfdir}/event.d/ttyS0 %{buildroot}/%{_sysconfdir}/init/ttyS0.conf
+
 %post
 /sbin/chkconfig --add olpc-configure
 /sbin/chkconfig --add diskspacecheck
@@ -68,7 +75,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rc.d/init.d/diskspacerecover
 %config(noreplace) %{_sysconfdir}/hal/fdi/information/30-keymap-olpc.fdi
 %config(noreplace) %{_sysconfdir}/motd.olpc
-%config(noreplace) %{_sysconfdir}/event.d/ttyS0
+%config(noreplace) %{_sysconfdir}/init/ttyS0.conf
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-olpc-sd.rules
 %config(noreplace) %{_sysconfdir}/X11/xorg-dcon.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg-xo1.5-dcon.conf
@@ -78,6 +85,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> -  1.0.13-2
+- adjust for upstart 0.6
+
 * Fri Dec  4 2009 Daniel Drake <dsd at laptop.org> - 1.0.13-1
 - Bump to v1.0.13