rpms/xorg-x11-proto-devel/devel inputproto-1.4.2-card32.patch, NONE, 1.1 xorg-x11-proto-devel.spec, 1.68, 1.69

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2968

Modified Files:
	xorg-x11-proto-devel.spec 
Added Files:
	inputproto-1.4.2-card32.patch 
Log Message:
* Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 7.3-7
- inputproto-1.4.2-card32.patch: Make sure CARD32 is defined on lp64.


inputproto-1.4.2-card32.patch:

--- NEW FILE inputproto-1.4.2-card32.patch ---
diff -up inputproto-1.4.2/XI.h.jx inputproto-1.4.2/XI.h
--- inputproto-1.4.2/XI.h.jx	2007-04-24 08:40:11.000000000 -0400
+++ inputproto-1.4.2/XI.h	2007-11-13 11:53:37.000000000 -0500
@@ -50,9 +50,10 @@ SOFTWARE.
 /* Definitions used by the server, library and client */
 
 #ifndef _XI_H_
-
 #define _XI_H_
 
+#include <X11/X.h> /* CARD32 */
+
 #define sz_xGetExtensionVersionReq		8
 #define sz_xGetExtensionVersionReply		32
 #define sz_xListInputDevicesReq			4


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xorg-x11-proto-devel.spec	12 Nov 2007 23:38:23 -0000	1.68
+++ xorg-x11-proto-devel.spec	13 Nov 2007 16:55:59 -0000	1.69
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -60,6 +60,8 @@
 Provides: xproto = 7.0.10
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
+Patch1: inputproto-1.4.2-card32.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -82,6 +84,8 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
+%patch1 -p0 -b .card32
+
 %build
 
 # Proceed through each proto package directory, building them all
@@ -294,6 +298,9 @@
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 7.3-7
+- inputproto-1.4.2-card32.patch: Make sure CARD32 is defined on lp64.
+
 * Mon Nov 12 2007 Adam Jackson <ajax at redhat.com> 7.3-6
 - renderproto 0.9.3