rpms/xorg-x11-drv-evdev/OLPC-2 continue-with-no-buttons.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.18, 1.19

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12076/OLPC-2

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	continue-with-no-buttons.patch 
Log Message:
import srpms from mstone


continue-with-no-buttons.patch:

--- NEW FILE continue-with-no-buttons.patch ---
diff -ru a/src/evdev_btn.c b/src/evdev_btn.c
--- a/src/evdev_btn.c	2007-06-06 14:10:27.000000000 -0400
+++ b/src/evdev_btn.c	2008-03-23 16:58:00.000000000 -0400
@@ -412,13 +412,7 @@
 	if (btn->b_flags[i] & EV_BTN_B_PRESENT)
 	    btn->buttons = i + 1;
 
-    if (state->btn->buttons)
 	xf86Msg(X_INFO, "%s: Configured %d mouse buttons.\n", pInfo->name, state->btn->buttons);
-    else {
-	Xfree (state->btn);
-	state->btn = NULL;
-	return !Success;
-    }
 
     pInfo->flags |= XI86_SEND_DRAG_EVENTS | XI86_CONFIGURED;
     /*


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/OLPC-2/xorg-x11-drv-evdev.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-evdev.spec	17 Nov 2007 21:32:31 -0000	1.18
+++ xorg-x11-drv-evdev.spec	28 May 2008 00:48:19 -0000	1.19
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.2.0
-Release: 2norel%{?dist}
+Release: 3norel%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,6 +15,7 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0:    evdev-relative-touchpad.patch
+Patch1:    continue-with-no-buttons.patch
 
 ExcludeArch: s390 s390x
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .reltp
+%patch1 -p1 -b .btns
 
 %build
 %configure --disable-static
@@ -56,6 +58,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Fri May 23 2008 Cortland Setlow <cortland.setlow at gmail.com> 1.2-3
+- Add continue-with-no-buttons.patch
+
 * Wed Oct 10 2007 Bernardo Innocenti <bernie at codewiz.org> 1.2-2
 - Add evdev-relative-touchpad.patch