rpms/hal/F-12 hal-0.5.13-touchpad.patch, NONE, 1.1 hal.spec, 1.207, 1.208

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/hal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11632

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.13-touchpad.patch 
Log Message:
* Wed Nov 18 2009 Adam Jackson <ajax at redhat.com> 0.5.13-10
- hal-0.5.13-touchpad.patch: Make the logic for input.touchpad match the
  logic in the synaptics driver.


hal-0.5.13-touchpad.patch:
 device.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE hal-0.5.13-touchpad.patch ---
diff -up hal-0.5.13/hald/linux/device.c.jx hal-0.5.13/hald/linux/device.c
--- hal-0.5.13/hald/linux/device.c.jx	2009-07-15 02:54:11.000000000 -0400
+++ hal-0.5.13/hald/linux/device.c	2009-11-18 11:25:01.000000000 -0500
@@ -1164,7 +1164,10 @@ input_test_abs (HalDevice *d, const char
 				goto out;
 			}
 
-			if (test_bit (BTN_TOUCH, bitmask_key)) {
+			if ((test_bit (BTN_TOUCH, bitmask_key) ||
+			     test_bit (ABS_PRESSURE, bitmask_abs)) &&
+			    test_bit (BTN_TOOL_FINGER, bitmask_key) &&
+			    !test_bit (BTN_TOOL_PEN, bitmask_key)) {
 				hal_device_add_capability (d, "input.touchpad");
 				goto out;
 			}


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-12/hal.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- hal.spec	19 Oct 2009 05:47:28 -0000	1.207
+++ hal.spec	18 Nov 2009 16:26:12 -0000	1.208
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.13
-Release: 9%{?dist}
+Release: 10%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -53,6 +53,7 @@ Patch12: hal-mdfind.patch
 Patch13: hal-xen-unignore-axes.patch
 
 Patch100: hal-use-at-console.patch
+Patch101: hal-0.5.13-touchpad.patch
 
 License: AFL or GPLv2
 Group: System Environment/Libraries
@@ -146,6 +147,7 @@ API docs for HAL.
 %patch12 -p1 -b .mdfind
 %patch13 -p1 -b .xen-unignore
 %patch100 -p1 -b .drop-polkit
+%patch101 -p1 -b .touchpad
 
 autoreconf -i -f
 
@@ -286,6 +288,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Wed Nov 18 2009 Adam Jackson <ajax at redhat.com> 0.5.13-10
+- hal-0.5.13-touchpad.patch: Make the logic for input.touchpad match the
+  logic in the synaptics driver.
+
 * Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.5.13-9
 - hal-xen-unignore-axes.patch: force evdev to allow rel+abs axes on the Xen
   Virtual Pointer device (#523914)