[olpc-powerd] v26

[Daniel Drake]

commit afe03b71a1a67f02cef15ccddc2a9e4e0a79c3ba
Author: Daniel Drake <dsd at laptop.org>
Date:   Tue Aug 24 14:47:53 2010 -0600

    v26

 .gitignore       |    1 +
 olpc-powerd.spec |   32 ++++++++++++++++++++++++++++++--
 sources          |    2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f671da5..fd4897f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 olpc-powerd-21-gitb0b03d2.tar.gz
+/olpc-powerd-26-gitc001a99.tar.gz
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 46d93fc..effee97 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,13 +1,13 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 21
+Version: 26
 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-21-gitb0b03d2.tar.gz
+Source0: olpc-powerd-26-gitc001a99.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: kernel-headers
 Requires: olpc-kbdshim, upstart
@@ -25,6 +25,16 @@ The powerd daemon can function as an easily customizable replacement for ohmd,
 which is independent of X, dbus, and hald.  This package provides the powerd
 and olpc-switchd daemons, and related utilities.
 
+%package dbus
+Summary: D-Bus interface to powerd
+Group: System Environment/Base
+Requires: olpc-powerd, dbus
+BuildRequires: dbus-glib-devel
+
+%description dbus
+Provides a dbus-activated daemon to provide access to powerd functionality
+over the D-Bus system bus.
+
 %prep
 %setup -q
 
@@ -36,6 +46,9 @@ make
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 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}/powerd
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/postresume.d
@@ -53,7 +66,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags
 %{__install} -p -m 644 powerd.conf.dist $RPM_BUILD_ROOT%{_sysconfdir}/powerd/powerd.conf
 %{__install} -p -m 644 version $RPM_BUILD_ROOT%{_sysconfdir}/powerd/version
 %{__install} -p -m 644 olpc-pwr-log.sh $RPM_BUILD_ROOT%{_sysconfdir}/powerd/olpc-pwr-log.sh 
+%{__install} -p -m 644 usb-inhibits $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags/usb-inhibits
 
+%{__install} -p -m 755 powerd-dbus/powerd-dbus $RPM_BUILD_ROOT%{_libexecdir}/powerd-dbus
+%{__install} -p -m 644 powerd-dbus/powerd.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/powerd.conf
+%{__install} -p -m 644 powerd-dbus/org.freedesktop.ohm.service $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services/org.freedesktop.ohm.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,8 +90,15 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/powerd/pleaseconfirm.pgm
 %config(noreplace) %{_sysconfdir}/powerd/shuttingdown.pgm
 %config(noreplace) %{_sysconfdir}/powerd/powerd.conf
+%config(noreplace) %{_sysconfdir}/powerd/flags/usb-inhibits
 %{_sysconfdir}/powerd/version
 
+%files dbus
+%defattr(-,root,root,-)
+%{_libexecdir}/powerd-dbus
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/powerd.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.ohm.service
+
 %post
 # Only on install
 if [ $1 = 1 ] ; then
@@ -111,6 +135,10 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 24 2010 Daniel Drake <dsd at laptop.org>
+- 26-1
+- Update to v26
+
 * Mon May  3 2010 Paul Fox <pgf at laptop.org>
 - 21-1
 - close hole where creation of inhibit file won't always inhibit suspend.
diff --git a/sources b/sources
index 9708dee..fce74a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0407791345362a04b1c4421cb3af8eb7  olpc-powerd-21-gitb0b03d2.tar.gz
+5cb048e58edec771eede8c93955037ae  olpc-powerd-26-gitc001a99.tar.gz