[olpc-powerd] v28 + upstart 0.6

[Daniel Drake]

commit 131f1e3e8fe6e2f5598320fc940516c2bb7822c0
Author: Daniel Drake <dsd at laptop.org>
Date:   Wed Sep 22 18:11:17 2010 +0100

    v28 + upstart 0.6

 .gitignore       |    1 +
 olpc-powerd.spec |   20 +++++++++++++-------
 sources          |    2 +-
 upstart06.patch  |   36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd4897f..b9eb23a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 olpc-powerd-21-gitb0b03d2.tar.gz
 /olpc-powerd-26-gitc001a99.tar.gz
+/olpc-powerd-28-gita10667b.tar.gz
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index effee97..da5c496 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,13 +1,14 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 26
+Version: 28
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/powerd
-Source0: olpc-powerd-26-gitc001a99.tar.gz
+Source0: olpc-powerd-28-gita10667b.tar.gz
+Patch1: upstart06.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: kernel-headers
 Requires: olpc-kbdshim, upstart
@@ -37,6 +38,7 @@ over the D-Bus system bus.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -49,7 +51,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/event.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/postresume.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags
@@ -59,8 +61,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags
 %{__install} -p -m 755 pnmto565fb $RPM_BUILD_ROOT/%{_bindir}/pnmto565fb
 %{__install} -p -m 755 powerd-config $RPM_BUILD_ROOT/%{_bindir}/powerd-config
 %{__install} -p -m 755 olpc-nosleep $RPM_BUILD_ROOT/%{_bindir}/olpc-nosleep
-%{__install} -p -m 644 olpc-switchd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/event.d/olpc-switchd
-%{__install} -p -m 644 powerd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/event.d/powerd
+%{__install} -p -m 644 olpc-switchd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/init/olpc-switchd.conf
+%{__install} -p -m 644 powerd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/init/powerd.conf
 %{__install} -p -m 644 pleaseconfirm.pgm $RPM_BUILD_ROOT%{_sysconfdir}/powerd/pleaseconfirm.pgm
 %{__install} -p -m 644 shuttingdown.pgm $RPM_BUILD_ROOT%{_sysconfdir}/powerd/shuttingdown.pgm
 %{__install} -p -m 644 powerd.conf.dist $RPM_BUILD_ROOT%{_sysconfdir}/powerd/powerd.conf
@@ -85,8 +87,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/powerd-config
 %{_bindir}/olpc-nosleep
 %{_sysconfdir}/powerd/olpc-pwr-log.sh
-%config(noreplace) %{_sysconfdir}/event.d/olpc-switchd
-%config(noreplace) %{_sysconfdir}/event.d/powerd
+%config(noreplace) %{_sysconfdir}/init/olpc-switchd.conf
+%config(noreplace) %{_sysconfdir}/init/powerd.conf
 %config(noreplace) %{_sysconfdir}/powerd/pleaseconfirm.pgm
 %config(noreplace) %{_sysconfdir}/powerd/shuttingdown.pgm
 %config(noreplace) %{_sysconfdir}/powerd/powerd.conf
@@ -135,6 +137,10 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 22 2010 Daniel Drake <dsd at laptop.org>
+- 28-1
+- Update to v28, update for Upstart 0.6
+
 * Tue Aug 24 2010 Daniel Drake <dsd at laptop.org>
 - 26-1
 - Update to v26
diff --git a/sources b/sources
index fce74a1..84219f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cb048e58edec771eede8c93955037ae  olpc-powerd-26-gitc001a99.tar.gz
+6e5ba939c282348b3bfa71ac548f7700  olpc-powerd-28-gita10667b.tar.gz
diff --git a/upstart06.patch b/upstart06.patch
new file mode 100644
index 0000000..5421480
--- /dev/null
+++ b/upstart06.patch
@@ -0,0 +1,36 @@
+Index: olpc-powerd-28/olpc-switchd.upstart
+===================================================================
+--- olpc-powerd-28.orig/olpc-switchd.upstart
++++ olpc-powerd-28/olpc-switchd.upstart
+@@ -2,11 +2,9 @@
+ description     "XO hw switch handler"
+ author          "Paul Fox"
+ 
+-start on stopping rc5
++start on stopping rc RUNLEVEL=5
+ 
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
++stop on runlevel [016]
+ 
+ console output
+ 
+Index: olpc-powerd-28/powerd.upstart
+===================================================================
+--- olpc-powerd-28.orig/powerd.upstart
++++ olpc-powerd-28/powerd.upstart
+@@ -2,11 +2,9 @@
+ description     "XO experimental power daemon "
+ author          "Paul Fox"
+ 
+-start on stopping rc5
++start on stopping rc RUNLEVEL=5
+ 
+-stop on runlevel 0
+-stop on runlevel 1
+-stop on runlevel 6
++stop on runlevel [016]
+ 
+ console output
+