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

[Adam Jackson (ajax)]

Author: ajax

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

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


penmount-1.1.0-calibration.patch:

--- NEW FILE penmount-1.1.0-calibration.patch ---
diff -up xf86-input-penmount-1.1.0/src/xf86PM.c.jx xf86-input-penmount-1.1.0/src/xf86PM.c
--- xf86-input-penmount-1.1.0/src/xf86PM.c.jx	2006-04-07 14:06:19.000000000 -0400
+++ xf86-input-penmount-1.1.0/src/xf86PM.c	2007-07-12 17:12:57.000000000 -0400
@@ -558,7 +558,7 @@ ReadInput (InputInfoPtr pInfo)
 static int
 ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
 {
-	xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+	xDeviceTSCtl *c = (xDeviceTSCtl *) control;
 	PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
 
         priv->min_x = c->min_x;


Index: xorg-x11-drv-penmount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-penmount/devel/xorg-x11-drv-penmount.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-penmount.spec	18 Jun 2007 19:47:30 -0000	1.15
+++ xorg-x11-drv-penmount.spec	12 Jul 2007 21:36:31 -0000	1.16
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
 Version:   1.1.0
-Release:   4%{?dist}
+Release:   5%{?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:	penmount-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
 
@@ -24,6 +27,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .calibration
 
 %build
 %configure --disable-static
@@ -47,6 +51,9 @@
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.1.0-5
+- Fix build with new inputproto.
+
 * Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 1.1.0-4
 - Update Requires and BuildRequires.  Disown the module directories.