[olpc-kbdshim/f14: 10/10] fix merge

[Peter Robinson]

commit cd94362dbaf0f404cad7c5097176569782f102e5
Merge: 4067bd7 d6f9827
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 19 22:40:06 2011 +0000

    fix merge

 olpc-kbdshim.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc olpc-kbdshim.spec
index b946b0e,4d72866..1e2204b
--- a/olpc-kbdshim.spec
+++ b/olpc-kbdshim.spec
@@@ -30,14 -31,20 +30,16 @@@ export OPT_FLAGS="$RPM_OPT_FLAGS
  make
  
  %install
 -rm -rf $RPM_BUILD_ROOT
  mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init
  
  %{__install} -p -m 755 olpc-kbdshim-udev $RPM_BUILD_ROOT/%{_bindir}/olpc-kbdshim-udev
  %{__install} -p -m 755 olpc-rotate $RPM_BUILD_ROOT/%{_bindir}/olpc-rotate
  %{__install} -p -m 755 olpc-brightness $RPM_BUILD_ROOT/%{_bindir}/olpc-brightness
  %{__install} -p -m 755 olpc-volume $RPM_BUILD_ROOT/%{_bindir}/olpc-volume
+ %{__install} -p -m 644 olpc-kbdshim-udev.upstart $RPM_BUILD_ROOT%{_sysconfdir}/init/olpc-kbdshim-udev.conf
  
  
 -%clean
 -rm -rf $RPM_BUILD_ROOT
 -
  %files
  %defattr(-,root,root,-)
  %doc README COPYING