[olpc-powerd/f14: 7/7] merge changes

[Peter Robinson]

commit 3d1b4a1e040dcfac14f4729dfb8b682dbdc89efd
Merge: 740d0b7 df429e8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 19 22:16:21 2011 +0000

    merge changes

 .gitignore           |    2 +-
 olpc-powerd.spec     |  157 ++++++++++++++++++++-----------------------------
 olpc-switchd.service |   10 +++
 powerd.service       |    8 +++
 4 files changed, 83 insertions(+), 94 deletions(-)
---
diff --cc olpc-powerd.spec
index 1e60370,9d5d0bd..11b5bf3
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@@ -5,12 -7,15 +7,13 @@@ 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-38-gitfc5b8f7.tar.gz
- BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ Source0: %{name}-%{version}-%{tag}.tar.gz
 -Source1: powerd.service
 -Source2: olpc-switchd.service
+ 
  BuildRequires: kernel-headers, NetworkManager-glib-devel
 -Requires: olpc-kbdshim, ethtool, systemd-units, evtest
 +Requires: olpc-kbdshim, upstart, ethtool, evtest
  
  # these are all for the manipulation of ohmd -- powerd doesn't need them.
  Requires(post): chkconfig
@@@ -43,36 -48,33 +46,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}/init
- 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 olpc-switchd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/init/olpc-switchd.conf
- %{__install} -p -m 644 powerd.upstart $RPM_BUILD_ROOT%{_sysconfdir}/init/powerd.conf
- %{__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
- 
- %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}/init
+ 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 olpc-switchd.upstart %{buildroot}/%{_sysconfdir}/init/olpc-switchd.conf
++install -p -m 644 powerd.upstart %{buildroot}/%{_sysconfdir}/init/powerd.conf
+ 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,-)
  %doc COPYING
@@@ -146,9 -144,15 +145,12 @@@ exit 
  - 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 fedoraproject.org> - 33-3
+ - Add ARM to exclusive platforms
+ 
 -* Sun Mar 13 2011 Daniel Drake <dsd at laptop.org> - 33-2
 -- port to systemd
 -
  * Sun Feb 20 2011 Daniel Drake <dsd at laptop.org> - 33-1
  - latest version