[olpc-powerd/f14] version 46

[Paul Fox]

commit f6c63345426d4dff456de404001a978d611ad7cf
Author: Paul Fox <pgf at laptop.org>
Date:   Fri Mar 9 09:17:20 2012 -0500

    version 46
    
    removed ohmd manipulation from install/uninstall/upgrade stanzas

 olpc-powerd.spec |   29 ++++++++++++-----------------
 sources          |    2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 5330c65..e92be5a 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,7 +1,7 @@
 
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 45
+Version: 46
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -11,23 +11,23 @@ URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
 # a clone of this git tree: git://dev.laptop.org/users/pgf/powerd
 # %define tag gita107bac
 # Source0: %{name}-%{version}-%{tag}.tar.gz
-Source0: olpc-powerd-45-git37e6c60.tar.gz
+Source0: olpc-powerd-46-git09a6ba5.tar.gz
 
 BuildRequires: kernel-headers, NetworkManager-glib-devel
 Requires: olpc-kbdshim, upstart, ethtool, evtest
 
-# these are all for the manipulation of ohmd -- powerd doesn't need them.
-Requires(post): chkconfig
-Requires(preun): chkconfig
+# these may have been for the manipulation of ohmd -- i don't think
+# powerd needs them.
 Requires(post): initscripts
 Requires(preun): initscripts
 
 ExclusiveArch: %{ix86} %{arm}
 
 %description
-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.
+powerd is the user-level power management daemon for the XO family of
+laptops.  It is independent of X, and moderately independent of dbus.  This
+package provides the powerd and olpc-switchd daemons, and related
+utilities.
 
 %package dbus
 Summary: D-Bus interface to powerd
@@ -99,10 +99,6 @@ install -p -m 644 powerd-dbus/powerd.conf %{buildroot}%{_sysconfdir}/dbus-1/syst
 %post
 # Only on install
 if [ $1 = 1 ] ; then
-    if test -e /etc/init.d/ohmd ; then
-        service ohmd stop >/dev/null 2>&1
-        chkconfig ohmd off 
-    fi
     initctl -q start powerd
     initctl -q start olpc-switchd
 fi
@@ -113,11 +109,6 @@ exit 0
 if [ $1 = 0 ] ; then
     initctl stop -q olpc-switchd
     initctl stop -q powerd
-    if test -e /etc/init.d/ohmd
-    then
-        /sbin/service ohmd start >/dev/null 2>&1
-        /sbin/chkconfig ohmd on
-    fi
 fi
 exit 0
 
@@ -132,6 +123,10 @@ fi
 exit 0
 
 %changelog
+* Fri Mar  9 2012 Paul Fox <pgf at laptop.org> - 46-1
+- improve behavior after wlan wakeups
+- recover some lost ambient light sensor events
+
 * Tue Feb 21 2012 Paul Fox <pgf at laptop.org> - 45-1
 - implement wakeup control for recently controllable devices.
 
diff --git a/sources b/sources
index e280e27..294f43f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34820f33204fc9d2185f8a1abe2ed1df  olpc-powerd-45-git37e6c60.tar.gz
+88aaf1f1134a55d6b7f7b1162d98d85a  olpc-powerd-46-git09a6ba5.tar.gz