[olpc-kbdshim/f14] v19

[Daniel Drake]

commit ea06ae347457f505db6212838881573cbffae57d
Author: Daniel Drake <dsd at laptop.org>
Date:   Thu Aug 4 20:29:15 2011 +0100

    v19

 .gitignore        |    1 +
 olpc-kbdshim.spec |   37 ++++++++++++++++++-------------------
 sources           |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 691d0dd..1657c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ olpc-kbdshim-12-git67c4b98.tar.gz
 /olpc-kbdshim-15-git4c22d59.tar.gz
 /olpc-kbdshim-16-gitd9a96bc.tar.gz
 /olpc-kbdshim-17-git59ee055.tar.gz
+/olpc-kbdshim-19-gitcf77c1b.tar.gz
diff --git a/olpc-kbdshim.spec b/olpc-kbdshim.spec
index a933d8a..9bafe2a 100644
--- a/olpc-kbdshim.spec
+++ b/olpc-kbdshim.spec
@@ -1,27 +1,27 @@
 Summary: OLPC XO keyboard support daemon
 Name: olpc-kbdshim
-Version: 17
-Release: 2%{?dist}
+Version: 19
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/olpc-kbdshim/tree/README
 # 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: olpc-kbdshim-17-git59ee055.tar.gz
+Source0: olpc-kbdshim-19-gitcf77c1b.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: kernel-headers, pkgconfig, glib2-devel
-BuildRequires: dbus-glib-devel, hal-devel
+BuildRequires: dbus-glib-devel, libudev-devel
 ExclusiveArch: %{ix86} %{arm}
 
-Requires: hal
+Requires: udev, upstart
 
 %description
-The olpc-kbdshim-hal daemon integrates with hal to monitor the keyboard and
-touchpad, enabling the XO "grab" keys and touchpad rotation (to match
-screen rotation), and reporting user (in)activity.  It can also bind the XO
-screen rotate, brightness, and volume keys to appropriate commands (which are
-provided).
+The olpc-kbdshim-udev daemon monitors the keyboard and touchpad,
+enabling the XO "grab" keys and touchpad rotation (to match
+screen rotation), and reporting user (in)activity.  It can also
+bind the XO screen rotate, brightness, and volume keys to
+appropriate commands (which are provided).
 
 %prep
 %setup -q
@@ -32,15 +32,14 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/policy/20thirdparty
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init
 
-%{__install} -p -m 755 olpc-kbdshim-hal $RPM_BUILD_ROOT/%{_libexecdir}/olpc-kbdshim-hal
-%{__install} -p -m 644 20-olpc-kbdshim.fdi $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/policy/20thirdparty/20-olpc-kbdshim.fdi
+%{__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
@@ -50,17 +49,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING
 
-%{_libexecdir}/olpc-kbdshim-hal
-%{_datadir}/hal/fdi/policy/20thirdparty/20-olpc-kbdshim.fdi
+%{_bindir}/olpc-kbdshim-udev
 %{_bindir}/olpc-rotate
 %{_bindir}/olpc-brightness
 %{_bindir}/olpc-volume
+%config(noreplace) %{_sysconfdir}/init/olpc-kbdshim-udev.conf
 
-%post
-echo A system restart may be necessary for
-echo proper initialization of olpc-kbdshim-hal.
 
 %changelog
+* Thu Aug  4 2011 Daniel Drake <dsd at laptop.org> - 19-1
+- libudev port
+
 * Sun Jun 26 2011 Peter Robinson <pbrobinson at gmail.com> - 17-2
 - Add ARM to exclusive platforms
 
diff --git a/sources b/sources
index d528729..da9904b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8316f1977d54ac966949d1aaf7cbaf2b  olpc-kbdshim-17-git59ee055.tar.gz
+8e33c9c8e8ab27e6d1478dd1997ac6f9  olpc-kbdshim-19-gitcf77c1b.tar.gz