[olpc-powerd] v38, mass spec update

[Peter Robinson]

commit df429e8b118c042f7a3632d4d822b7f97a2eaad5
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 19 21:04:11 2011 +0000

    v38, mass spec update

 .gitignore       |   10 +---
 olpc-powerd.spec |  163 ++++++++++++++++++++++--------------------------------
 sources          |    2 +-
 3 files changed, 69 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 102027a..89b7332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-olpc-powerd-21-gitb0b03d2.tar.gz
-/olpc-powerd-26-gitc001a99.tar.gz
-/olpc-powerd-28-gita10667b.tar.gz
-/olpc-powerd-29-git5bcb2bd.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
-/olpc-powerd-37-gitf617b29.tar.gz
+/olpc-powerd-*.tar.gz
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index c700a25..9d5d0bd 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,16 +1,19 @@
+%define tag gitfc5b8f7
+
 Summary: OLPC XO power management
 Name: olpc-powerd
-Version: 37
+Version: 38
 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-37-gitf617b29.tar.gz
+Source0: %{name}-%{version}-%{tag}.tar.gz
 Source1: powerd.service
 Source2: olpc-switchd.service
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildRequires: kernel-headers, NetworkManager-glib-devel
 Requires: olpc-kbdshim, ethtool, systemd-units, evtest
 
@@ -45,36 +48,32 @@ export OPT_FLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-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%{_sysconfdir}/dbus-1/system.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/postresume.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/powerd/flags
-
-%{__install} -p -m 755 olpc-switchd $RPM_BUILD_ROOT/%{_sbindir}/olpc-switchd
-%{__install} -p -m 755 powerd $RPM_BUILD_ROOT/%{_sbindir}/powerd
-%{__install} -p -m 755 pnmto565fb $RPM_BUILD_ROOT/%{_bindir}/pnmto565fb
-%{__install} -p -m 755 powerd-config $RPM_BUILD_ROOT/%{_bindir}/powerd-config
-%{__install} -p -m 755 olpc-nosleep $RPM_BUILD_ROOT/%{_bindir}/olpc-nosleep
-%{__install} -p -m 644 pleaseconfirm.pgm $RPM_BUILD_ROOT%{_sysconfdir}/powerd/pleaseconfirm.pgm
-%{__install} -p -m 644 shuttingdown.pgm $RPM_BUILD_ROOT%{_sysconfdir}/powerd/shuttingdown.pgm
-%{__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 -d $RPM_BUILD_ROOT/lib/systemd/system
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/powerd.service
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/olpc-switchd.service
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_libexecdir}
+mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
+mkdir -p %{buildroot}%{_sysconfdir}/powerd
+mkdir -p %{buildroot}%{_sysconfdir}/powerd/postresume.d
+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 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 usb-inhibits %{buildroot}%{_sysconfdir}/powerd/flags/usb-inhibits
+
+install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd-dbus
+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
 
 %files
 %defattr(-,root,root,-)
@@ -134,6 +133,9 @@ fi
 exit 0
 
 %changelog
+* Sat Nov 19 2011 Peter Robinson <pbrobinson at fedoraproject.org> 38-1
+- update to 38
+
 * Wed Oct 19 2011 Daniel Drake <dsd at laptop.org> - 37-1
 - Reduce window for suspend during network connection
 - Close unused input devices in switchd
@@ -142,10 +144,10 @@ exit 0
 - 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
+* Thu Sep 01 2011 Daniel Drake <dsd at laptop.org> - 35-1
 - Initial XO-1.75 support
 
-* Sun Jun 26 2011 Peter Robinson <pbrobinson at gmail.com> - 33-3
+* Sun Jun 26 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 33-3
 - Add ARM to exclusive platforms
 
 * Sun Mar 13 2011 Daniel Drake <dsd at laptop.org> - 33-2
@@ -160,14 +162,12 @@ exit 0
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 31-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Thu Nov 25 2010 Daniel Drake <dsd at laptop.org>
-- 31-1
+* Thu Nov 25 2010 Daniel Drake <dsd at laptop.org> - 31-1
 - Lid wakeup improvements on XO-1
 - LED bug workaround for XO-1
 - Enable wake-on-multicast if salut collaboration is being used
 
-* Mon Nov  8 2010 Daniel Drake <dsd at laptop.org>
-- 29-1
+* Mon Nov  8 2010 Daniel Drake <dsd at laptop.org> - 29-1
 - opening lid no longer wakes the laptop, to suppress unwanted
  wakeups when laptops are stacked. (configurable)
 - improvements for very short idle timeouts
@@ -176,33 +176,27 @@ exit 0
 * Wed Sep 29 2010 jkeating - 28-2
 - Rebuilt for gcc bug 634757
 
-* Wed Sep 22 2010 Daniel Drake <dsd at laptop.org>
-- 28-1
+* Wed Sep 22 2010 Daniel Drake <dsd at laptop.org> - 28-1
 - Update to v28, update for Upstart 0.6
 
-* Tue Aug 24 2010 Daniel Drake <dsd at laptop.org>
-- 26-1
+* 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
+* Mon May  3 2010 Paul Fox <pgf at laptop.org> - 21-1
 - close hole where creation of inhibit file won't always inhibit suspend.
 - close hole where net traffic won't inhibit suspend after a lot of traffic
 
-* Fri Apr 30 2010 Paul Fox <pgf at laptop.org>
-- 20-1
+* Fri Apr 30 2010 Paul Fox <pgf at laptop.org> - 20-1
 - add preemptive sync on power button, or when idle suspend is imminent.
 - fix bug causing power button splash menu to not appear sometimes.
 - bring documentation up to date.
 
-* Thu Apr 15 2010 Paul Fox <pgf at laptop.org>
-- 19-1
+* Thu Apr 15 2010 Paul Fox <pgf at laptop.org> - 19-1
 - improve olpc-pwr-log.sh logging
 - modify handling of battery dis/charge wakeups which were preventing
   eventual shutdown.
 
-* Tue Apr  6 2010 Paul Fox <pgf at laptop.org>
-- 18-1
+* Tue Apr  6 2010 Paul Fox <pgf at laptop.org> - 18-1
 - ensure dcon is awake and unfrozen if powerd exits.
 - enable network activity checks:  pings, inbound traffic for
   established tcp connections, as well as any non-mdns outbound
@@ -210,24 +204,20 @@ exit 0
   inhibit suspend.
 - bug fixes for recently introduced problems.
 
-* Mon Apr  5 2010 Paul Fox <pgf at laptop.org>
-- 17-1
+* Mon Apr  5 2010 Paul Fox <pgf at laptop.org> - 17-1
 - reorder the background "xxx_is_busy" checks for better useability.
 
-* Tue Mar 30 2010 Paul Fox <pgf at laptop.org>
-- 16-1
+* Tue Mar 30 2010 Paul Fox <pgf at laptop.org> - 16-1
 - inhibit suspend when camera is active
 - lower the cpu busy-ness threshold required to inhibit suspend --
   audio apps now inhibit.
 - make trace file easier to summarize.  (grep for ": @")
 - suppress wake-on-wlan when screen is blanked, by default.
 
-* Wed Mar 24 2010 Paul Fox <pgf at laptop.org>
-- 15-1
+* Wed Mar 24 2010 Paul Fox <pgf at laptop.org> - 15-1
 - ensure battery and AC events are always reported correctly
 
-* Wed Mar 24 2010 Paul Fox <pgf at laptop.org>
-- 14-1
+* Wed Mar 24 2010 Paul Fox <pgf at laptop.org> - 14-1
 - allow keypress to wake from a blanked idle-suspend state
 - properly keep wireless working during idle suspends
 - check for closed lid on startup, so we sleep right away
@@ -236,93 +226,74 @@ exit 0
 - force a date stamp into the trace file on startup
 - lengthen dim/blank/shutdown timeouts
 
-* Fri Mar 12 2010 Paul Fox <pgf at laptop.org>
-- 13-1
+* Fri Mar 12 2010 Paul Fox <pgf at laptop.org> - 13-1
 - early enhancements/fixes to olpc-pwr-log functionality
 
-* Tue Mar  9 2010 Paul Fox <pgf at laptop.org>
-- 12-1
+* Tue Mar  9 2010 Paul Fox <pgf at laptop.org> - 12-1
 - integrate the functionality of olpc-pwr-log
 - setting most timer values to 0 now does something interesting
 - catch events that might be lost during brief action wakeups
 
-* Fri Feb 19 2010 Paul Fox <pgf at laptop.org>
-- 11-1
+* Fri Feb 19 2010 Paul Fox <pgf at laptop.org> - 11-1
 - adjust default dim/suspend times (suspend long before dim)
 - new olpc-nosleep wrapper command for inhibiting suspend
 - support for XO-1.5
 - new persistent inhibit file
 - unfreeze delay is configurable
 
-* Mon Jan 25 2010 Paul Fox <pgf at laptop.org>
-- 10-1
+* Mon Jan 25 2010 Paul Fox <pgf at laptop.org> - 10-1
 - speedups in splash image drawing
 - remove some bash-isms so powerd will run with dash on debian
 - improvements to make input switch device detection more robust.
 - powerd.wip is work-in-progress for supporting XO-1.5.
 
-* Thu Jul 30 2009 Paul Fox <pgf at laptop.org>
-- 9-1
+* Thu Jul 30 2009 Paul Fox <pgf at laptop.org> - 9-1
 - disable tracing, by default.  use "powerd-control =tracing-on" to enable at runtime.
 - create the inhibit file so that root owns it and can make it writeable.
 - don't brighten the screen on wlan wakeups.
 
-* Fri Jul 17 2009 Paul Fox <pgf at laptop.org>
-- 8-1
+* Fri Jul 17 2009 Paul Fox <pgf at laptop.org> - 8-1
 - incorporate package review fixups
 - commentary and powerd-config UI clarification
 - fix fatal bug when battery is missing
 
-* Fri Jul 6 2009 Paul Fox <pgf at laptop.org>
-- 7-1
+* Fri Jul 6 2009 Paul Fox <pgf at laptop.org> - 7-1
 - no longer wake on AC events -- unnecessary
 - doc fixups
 
-* Thu Jun 11 2009 Paul Fox <pgf at laptop.org>
-- 6-2
+* Thu Jun 11 2009 Paul Fox <pgf at laptop.org> - 6-2
 - utility targets in makefile
 
-* Sat Jun 6 2009 Paul Fox <pgf at laptop.org>
-- 6-1
+* Sat Jun 6 2009 Paul Fox <pgf at laptop.org> - 6-1
 - various fixes
 - incorporate lessons from kbdshim review
 
-* Tue May 5 2009 Paul Fox <pgf at laptop.org>
-- 5-1
+* Tue May 5 2009 Paul Fox <pgf at laptop.org> - 5-1
 - fixed ability to shut down with backlight off.  oops.
 - various utility bug fixes (powerd-config, olpc-brightness)
 
-* Sun Apr 12 2009 Paul Fox <pgf at laptop.org>
-- 4-1
+* Sun Apr 12 2009 Paul Fox <pgf at laptop.org> - 4-1
 - add control over sleep on lid-close
 - resync version numbers
 
-* Sat Apr 11 2009 Paul Fox <pgf at laptop.org>
-- 3-3
+* Sat Apr 11 2009 Paul Fox <pgf at laptop.org> - 3-3
 - fixed powerd-config behavior wrt symlinked configs
 
-* Fri Apr 10 2009 Paul Fox <pgf at laptop.org>
-- 3-2
+* Fri Apr 10 2009 Paul Fox <pgf at laptop.org> - 3-2
 - fix bugs, implement cpu idleness check, and add suspend inhibit mechanism
 
-* Tue Apr 7 2009 Paul Fox <pgf at laptop.org>
-- 3-1
+* Tue Apr 7 2009 Paul Fox <pgf at laptop.org> - 3-1
 - convert to HAL-based operation
 
-* Thu Mar 19 2009 Paul Fox <pgf at laptop.org
-- 2-3
+* Thu Mar 19 2009 Paul Fox <pgf at laptop.org> - 2-3
 - removed extra dcon calls.
 
-* Thu Mar 19 2009 Paul Fox <pgf at laptop.org
-- 2-2
+* Thu Mar 19 2009 Paul Fox <pgf at laptop.org> - 2-2
 - bug fixing
 
-* Tue Mar 17 2009 Paul Fox <pgf at laptop.org
-- 2-1 
+* Tue Mar 17 2009 Paul Fox <pgf at laptop.org> - 2-1 
 - added powerd-config, and added blank-or-shutdown after sleep
   capability
 
-* Fri Mar 13 2009 Paul Fox <pgf at laptop.org>
-- 1-2
+* Fri Mar 13 2009 Paul Fox <pgf at laptop.org> - 1-2
 - fix rpmlint errors, move daemons to /usr/sbin
-
diff --git a/sources b/sources
index 5e5a19b..32a8bfb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25bb0254563033a77d26f42cb2d2a027  olpc-powerd-37-gitf617b29.tar.gz
+ff27fa855fe27cb9f034cfbcb4ce4564  olpc-powerd-38-gitfc5b8f7.tar.gz