rpms/xorg-x11-drv-microtouch/devel microtouch-1.1.0-calibration.patch, NONE, 1.1 xorg-x11-drv-microtouch.spec, 1.14, 1.15

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-microtouch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30455

Modified Files:
	xorg-x11-drv-microtouch.spec 
Added Files:
	microtouch-1.1.0-calibration.patch 
Log Message:
* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.1.0-4
- Fix build with new inputproto.


microtouch-1.1.0-calibration.patch:

--- NEW FILE microtouch-1.1.0-calibration.patch ---
diff -up xf86-input-microtouch-1.1.0/src/microtouch.c.jx xf86-input-microtouch-1.1.0/src/microtouch.c
--- xf86-input-microtouch-1.1.0/src/microtouch.c.jx	2006-04-07 13:55:01.000000000 -0400
+++ xf86-input-microtouch-1.1.0/src/microtouch.c	2007-07-12 17:16:14.000000000 -0400
@@ -538,7 +538,7 @@ ReadInput (LocalDevicePtr local)
 static int
 ControlProc (LocalDevicePtr local, xDeviceCtl * control)
 {
-	xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+	xDeviceTSCtl *c = (xDeviceTSCtl *) control;
 	MuTPrivatePtr priv = (MuTPrivatePtr) (local->private);
 
 	priv->min_x = c->min_x;


Index: xorg-x11-drv-microtouch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-microtouch/devel/xorg-x11-drv-microtouch.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-microtouch.spec	18 Jun 2007 19:43:47 -0000	1.14
+++ xorg-x11-drv-microtouch.spec	12 Jul 2007 21:38:55 -0000	1.15
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,9 +13,12 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch0: microtouch-1.1.0-calibration.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-proto-devel >= 7.2-10
 
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
@@ -47,6 +50,9 @@
 %{_mandir}/man4/microtouch.4*
 
 %changelog
+* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.1.0-4
+- Fix build with new inputproto.
+
 * Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.0-3
 - Update Requires and BuildRequires.  Disown the module directories.