rpms/synaptics/devel 10-synaptics.fdi, NONE, 1.1 synaptics-0.14.6-tap-to-click.patch, NONE, 1.1 synaptics.spec, 1.30, 1.31

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/synaptics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2833

Modified Files:
	synaptics.spec 
Added Files:
	10-synaptics.fdi synaptics-0.14.6-tap-to-click.patch 
Log Message:
* Sun Mar 09 2008 Adam Jackson <ajax at redhat.com> 0.14.6-4
- 10-synaptics.fdi: Get hal to report the X driver as synaptics for
  touchpads we support.
- synaptics-0.14.6-tap-to-click.patch: Disable tap to click by default in
  the name of accessibility.



--- NEW FILE 10-synaptics.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<deviceinfo version="0.2">
  <device>
    <match key="info.capabilities" contains="input.touchpad">
      <match key="info.product" contains="Synaptics TouchPad">
	<merge key="input.x11_driver" type="string">synaptics</merge>
      </match>
      <match key="info.product" contains="AlpsPS/2 ALPS">
	<merge key="input.x11_driver" type="string">synaptics</merge>
      </match>
    </match>
  </device>
</deviceinfo>

synaptics-0.14.6-tap-to-click.patch:

--- NEW FILE synaptics-0.14.6-tap-to-click.patch ---
diff -up synaptics-0.14.6/synaptics.c.jx synaptics-0.14.6/synaptics.c
--- synaptics-0.14.6/synaptics.c.jx	2008-03-09 13:55:18.000000000 -0400
+++ synaptics-0.14.6/synaptics.c	2008-03-09 14:03:31.000000000 -0400
@@ -395,13 +395,13 @@ SynapticsPreInit(InputDriverPtr drv, IDe
     pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", 0);
     pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE);
     pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
-    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2);
-    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3);
+    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0);
+    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 0);
     pars->tap_action[LT_TAP] = xf86SetIntOption(opts, "LTCornerButton", 0);
     pars->tap_action[LB_TAP] = xf86SetIntOption(opts, "LBCornerButton", 0);
-    pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1",     1);
-    pars->tap_action[F2_TAP] = xf86SetIntOption(opts, "TapButton2",     2);
-    pars->tap_action[F3_TAP] = xf86SetIntOption(opts, "TapButton3",     3);
+    pars->tap_action[F1_TAP] = xf86SetIntOption(opts, "TapButton1",     0);
+    pars->tap_action[F2_TAP] = xf86SetIntOption(opts, "TapButton2",     0);
+    pars->tap_action[F3_TAP] = xf86SetIntOption(opts, "TapButton3",     0);
     pars->circular_scrolling = xf86SetBoolOption(opts, "CircularScrolling", FALSE);
     pars->circular_trigger   = xf86SetIntOption(opts, "CircScrollTrigger", 0);
     pars->circular_pad       = xf86SetBoolOption(opts, "CircularPad", FALSE);


Index: synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- synaptics.spec	4 Mar 2008 22:38:08 -0000	1.30
+++ synaptics.spec	9 Mar 2008 18:08:40 -0000	1.31
@@ -2,20 +2,23 @@
 
 Name:           synaptics
 Version:        0.14.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
 License:        GPL
 URL:            http://w1.894.telia.com/~u89404340/touchpad/
 Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/%{name}-%{version}.tar.bz2
+Source1:	10-synaptics.fdi
 Patch0: synaptics-0.14.6-delibcwrap.patch
 Patch1: synaptics-0.14.6-newx.patch
+Patch2: synaptics-0.14.6-tap-to-click.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires:  libX11-devel, libXi-devel, libXext-devel
 Requires:       xorg-x11-server-Xorg >= 1.0.99.901
+Requires:	hal
 # This is what it should be, but the buildsystem is a disaster
 # ExcludeArch:	s390 s390x
 ExclusiveArch: %{ix86} x86_64 ppc ppc64
@@ -47,6 +50,7 @@
 %if "%{?fedora}" >= "9"
 %patch1 -p1 -b .newx
 %endif
+%patch2 -p1 -b .tap
 # remove included XFree86 headers
 rm -rf Xincludes
 
@@ -61,18 +65,28 @@
 	ARCH='%{_arch}' \
 	install
 
+install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -m 0644 ../10-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR LICENSE README README.alps TODO
+%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
 %{moduledir}/input/*
 %{_bindir}/synclient
 %{_bindir}/syndaemon
 %{_mandir}/man?/*
 
 %changelog
+* Sun Mar 09 2008 Adam Jackson <ajax at redhat.com> 0.14.6-4
+- 10-synaptics.fdi: Get hal to report the X driver as synaptics for
+  touchpads we support.
+- synaptics-0.14.6-tap-to-click.patch: Disable tap to click by default in
+  the name of accessibility.
+
 * Wed Mar 05 2008 Dave Airlie <airlied at redhat.com> 0.14.6-3
 - rebuild for ppc64