[olpc-powerd/f17] new version 101, with bundled systemd control files

[Paul Fox]

commit 6307714beece2fbf515d00e32f83cd585ee8fa0b
Author: Paul Fox <pgf at laptop.org>
Date:   Mon Apr 30 12:34:06 2012 -0400

    new version 101, with bundled systemd control files

 olpc-powerd.spec     |   18 +++++++++++-------
 olpc-switchd.service |   10 ----------
 powerd.service       |    8 --------
 sources              |    2 +-
 4 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 081a097..91ed920 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,8 +1,8 @@
-%define tag 14ec660
+%define tag 3fe4964
 
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 100
+Version: 101
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -11,10 +11,8 @@ 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: %{name}-%{version}-git%{tag}.tar.gz
-Source1: powerd.service
-Source2: olpc-switchd.service
 
-BuildRequires: kernel-headers, NetworkManager-glib-devel, libusb-devel
+BuildRequires: kernel-headers, NetworkManager-glib-devel, libusb1-devel
 Requires: olpc-kbdshim, ethtool, systemd-units, evtest, inotify-tools, libusb
 
 ExclusiveArch: %{ix86} %{arm}
@@ -69,8 +67,8 @@ install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd/powe
 install -p -m 644 powerd-dbus/powerd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/powerd.conf
 
 install -d %{buildroot}/lib/systemd/system
-install -p -m 644 %{SOURCE1} %{buildroot}/lib/systemd/system/powerd.service
-install -p -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/olpc-switchd.service
+install -p -m 644 powerd.service %{buildroot}/lib/systemd/system/powerd.service
+install -p -m 644 olpc-switchd.service %{buildroot}/lib/systemd/system/olpc-switchd.service
 
 %files
 %defattr(-,root,root,-)
@@ -122,6 +120,12 @@ fi
 exit 0
 
 %changelog
+* Mon Apr 30 2012 Paul Fox <pgf at laptop.org> - 101-1
+- removed dependence on /proc/bus/usb
+- reimplemented XO-1 wlan power control
+- inhibit suspend when any ttyUSBn is in use
+- systemd control files from fedora upstream now bundled
+
 * Fri Mar 30 2012 Paul Fix <pgf at laptop.org> - 100-1
 - Support for 3.x kernels on XO-1 and XO-1.5
 - Improvments in inhibit-suspend flag
diff --git a/sources b/sources
index a077a1f..547adfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3e3fa265cda164d92f2a23499c982e1  olpc-powerd-100-git14ec660.tar.gz
+58071e9d8392d1189fc449c92e55dbe5  olpc-powerd-101-git3fe4964.tar.gz