[olpc-kbdshim/f18: 3/3] fix merge from f17

[Peter Robinson]

commit c899cc9270f134ed56450eba3cda0dd3493e2f5f
Merge: c8912c5 8c5c7ac
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 5 09:08:18 2012 +0100

    fix merge from f17

 olpc-kbdshim.service |   11 -----------
 olpc-kbdshim.spec    |   13 ++++++++-----
 sources              |    2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)
---
diff --cc olpc-kbdshim.spec
index 1a40e78,92001dd..3e75274
--- a/olpc-kbdshim.spec
+++ b/olpc-kbdshim.spec
@@@ -10,12 -10,12 +10,11 @@@ URL: http://dev.laptop.org/git/users/pg
  # Source0: the source tarball is created by "make tarball" from within
  # a clone of this git tree: git://dev.laptop.org/users/pgf/olpc-kbdshim
  Source0: %{name}-%{version}-git%{tag}.tar.gz
- Source1: olpc-kbdshim.service
  
  BuildRequires: kernel-headers, pkgconfig, glib2-devel
 -BuildRequires: dbus-glib-devel, libudev-devel
 +BuildRequires: dbus-glib-devel, systemd-devel
  ExclusiveArch: %{ix86} %{arm}
  
 -Requires: udev
  Requires: systemd-units
  
  %description
@@@ -78,12 -78,10 +77,16 @@@ f
  
  
  %changelog
+ * Mon Apr 30 2012 Paul Fox <pgf at laptop.org> - 27-1
+ - rotation bug fixes
+ - systemd control files now bundled in tarball
+ 
 +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 26-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
 +* Wed Jun 20 2012 Paul Fox <pgf at laptop.org> - 26-2
 +- fix libudev-devel requirement
 +
  * Wed Apr 18 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 26-1
  - support absolute input devices