[olpc-powerd/f16] v36

[Daniel Drake]

commit bd82539d022ec971f23b1476ce8566db856fc58c
Author: Daniel Drake <dsd at laptop.org>
Date:   Wed Sep 7 10:31:23 2011 +0100

    v36

 .gitignore       |    1 +
 olpc-powerd.spec |   15 ++++++++-------
 sources          |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2799e45..b8b340a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ olpc-powerd-21-gitb0b03d2.tar.gz
 /olpc-powerd-31-git0842bf1.tar.gz
 /olpc-powerd-33-giteefa283.tar.gz
 /olpc-powerd-35-git2676dc4.tar.gz
+/olpc-powerd-36-gita87418c.tar.gz
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index a3b852e..d9e5b13 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,18 +1,18 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 35
+Version: 36
 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-35-git2676dc4.tar.gz
+Source0: olpc-powerd-36-gita87418c.tar.gz
 Source1: powerd.service
 Source2: olpc-switchd.service
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: kernel-headers
-Requires: olpc-kbdshim, ethtool, systemd-units
+BuildRequires: kernel-headers, NetworkManager-glib-devel
+Requires: olpc-kbdshim, ethtool, systemd-units, evtest
 
 # these are all for the manipulation of ohmd -- powerd doesn't need them.
 Requires(post): chkconfig
@@ -49,7 +49,6 @@ 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}/powerd
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/postresume.d
@@ -69,7 +68,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags
 
 %{__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
 
 install -d $RPM_BUILD_ROOT/lib/systemd/system
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/powerd.service
@@ -99,7 +97,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -137,6 +134,10 @@ fi
 exit 0
 
 %changelog
+* Wed Sep 06 2011 Daniel Drake <dsd at laptop.org> - 36-1
+- Use evtest for switch state querying
+- powerd-dbus now inhibits suspend while connecting to wireless networks
+
 * Thu Sep 01 2011 Daniel Drake <pgf at laptop.org> - 35-1
 - Initial XO-1.75 support
 
diff --git a/sources b/sources
index 4aa22f3..a1a5b9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0383b2baac49cb548ad353c61dac3cf7  olpc-powerd-35-git2676dc4.tar.gz
+f6b9fc02e471d7383ab16c673dba63ba  olpc-powerd-36-gita87418c.tar.gz