[olpc-powerd/f17] v100, to reflect changes in filesystem layout

[Paul Fox]

commit 64f52e45e385f588933f43f8fd1258f18c9ec7ae
Author: Paul Fox <pgf at laptop.org>
Date:   Thu Mar 29 17:49:56 2012 -0400

    v100, to reflect changes in filesystem layout

 olpc-powerd.spec |   19 ++++++++++---------
 sources          |    2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 6c71a92..5cffba2 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,8 +1,8 @@
-%define tag 37e6c60
+%define tag 14ec660
 
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 45
+Version: 100
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -15,7 +15,7 @@ Source1: powerd.service
 Source2: olpc-switchd.service
 
 BuildRequires: kernel-headers, NetworkManager-glib-devel
-Requires: olpc-kbdshim, ethtool, systemd-units, evtest
+Requires: olpc-kbdshim, ethtool, systemd-units, evtest, inotify-tools
 
 ExclusiveArch: %{ix86} %{arm}
 
@@ -46,6 +46,7 @@ make
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libexecdir}
+mkdir -p %{buildroot}%{_libexecdir}/powerd
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 mkdir -p %{buildroot}%{_sysconfdir}/powerd
 mkdir -p %{buildroot}%{_sysconfdir}/powerd/postresume.d
@@ -53,17 +54,17 @@ mkdir -p %{buildroot}%{_sysconfdir}/powerd/flags
 
 install -p -m 755 olpc-switchd %{buildroot}%{_sbindir}/olpc-switchd
 install -p -m 755 powerd %{buildroot}%{_sbindir}/powerd
-install -p -m 755 pnmto565fb %{buildroot}%{_bindir}/pnmto565fb
+install -p -m 755 pnmto565fb %{buildroot}%{_libexecdir}/powerd/pnmto565fb
 install -p -m 755 powerd-config %{buildroot}%{_bindir}/powerd-config
 install -p -m 755 olpc-nosleep %{buildroot}%{_bindir}/olpc-nosleep
 install -p -m 644 pleaseconfirm.pgm %{buildroot}%{_sysconfdir}/powerd/pleaseconfirm.pgm
 install -p -m 644 shuttingdown.pgm %{buildroot}%{_sysconfdir}/powerd/shuttingdown.pgm
 install -p -m 644 powerd.conf.dist %{buildroot}%{_sysconfdir}/powerd/powerd.conf
 install -p -m 644 version %{buildroot}%{_sysconfdir}/powerd/version
-install -p -m 644 olpc-pwr-log.sh %{buildroot}%{_sysconfdir}/powerd/olpc-pwr-log.sh 
+install -p -m 644 power-logger %{buildroot}%{_libexecdir}/powerd/power-logger
 install -p -m 644 usb-inhibits %{buildroot}%{_sysconfdir}/powerd/flags/usb-inhibits
 
-install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd-dbus
+install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd/powerd-dbus
 install -p -m 644 powerd-dbus/powerd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/powerd.conf
 
 install -d %{buildroot}/lib/systemd/system
@@ -76,10 +77,10 @@ install -p -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/olpc-switchd.servic
 
 %{_sbindir}/olpc-switchd
 %{_sbindir}/powerd
-%{_bindir}/pnmto565fb
+%{_libexecdir}/powerd/pnmto565fb
 %{_bindir}/powerd-config
 %{_bindir}/olpc-nosleep
-%{_sysconfdir}/powerd/olpc-pwr-log.sh
+%{_libexecdir}/powerd/power-logger
 /lib/systemd/system/*
 %config(noreplace) %{_sysconfdir}/powerd/pleaseconfirm.pgm
 %config(noreplace) %{_sysconfdir}/powerd/shuttingdown.pgm
@@ -89,7 +90,7 @@ install -p -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/olpc-switchd.servic
 
 %files dbus
 %defattr(-,root,root,-)
-%{_libexecdir}/powerd-dbus
+%{_libexecdir}/powerd/powerd-dbus
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/powerd.conf
 
 %post
diff --git a/sources b/sources
index e280e27..a077a1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34820f33204fc9d2185f8a1abe2ed1df  olpc-powerd-45-git37e6c60.tar.gz
+f3e3fa265cda164d92f2a23499c982e1  olpc-powerd-100-git14ec660.tar.gz