new inputproto and xproto

This commit is contained in:
Adam Jackson 2008-03-06 03:17:19 +00:00
parent 68a3f8795d
commit a296d01e77
4 changed files with 15 additions and 30 deletions

View File

@ -7,10 +7,10 @@ fixesproto-4.0.tar.bz2
fontcacheproto-0.1.2.tar.bz2
fontsproto-2.0.2.tar.bz2
glproto-1.4.9.tar.bz2
inputproto-1.4.2.tar.bz2
kbproto-1.0.3.tar.bz2
randrproto-1.2.1.tar.bz2
recordproto-1.13.2.tar.bz2
renderproto-0.9.3.tar.bz2
resourceproto-1.0.2.tar.bz2
scrnsaverproto-1.1.0.tar.bz2
trapproto-3.4.3.tar.bz2
@ -24,6 +24,6 @@ xf86miscproto-0.9.2.tar.bz2
xf86rushproto-1.1.2.tar.bz2
xf86vidmodeproto-2.2.2.tar.bz2
xineramaproto-1.1.2.tar.bz2
xproto-7.0.10.tar.bz2
xproxymanagementprotocol-1.0.2.tar.bz2
renderproto-0.9.3.tar.bz2
inputproto-1.4.3.tar.bz2
xproto-7.0.12.tar.bz2

View File

@ -1,15 +0,0 @@
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

View File

@ -7,10 +7,10 @@ d80acad88411e7944b9b085463d53302 dmxproto-2.2.2.tar.bz2
60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2
c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2
e60951628422663e60faeb400f27bac1 glproto-1.4.9.tar.bz2
e2c4cf4c2ad59d1e27f09381f6b4a3c3 inputproto-1.4.2.tar.bz2
6092cdb0a1225f95356ddbe6c2abaad5 kbproto-1.0.3.tar.bz2
e2e45564f8ce22e00e1360e79c8ccdeb randrproto-1.2.1.tar.bz2
0ed4706564a34fc2aff724aa16d3ff00 recordproto-1.13.2.tar.bz2
598bc9a493deee2e48e4434e94467189 renderproto-0.9.3.tar.bz2
b823b314e37eb19dae1f297951d2e933 resourceproto-1.0.2.tar.bz2
5d551850e6f4acdf49a13f4eb3a5bbfa scrnsaverproto-1.1.0.tar.bz2
3b713239e5e6b269b31cb665563358df trapproto-3.4.3.tar.bz2
@ -24,6 +24,6 @@ acae8edeb05a406f7f60bcbb218a8f1d xf86miscproto-0.9.2.tar.bz2
b6a96ffdae084e27487a58314008b000 xf86rushproto-1.1.2.tar.bz2
f00844a63d6e76b69eb0eb5e41eed843 xf86vidmodeproto-2.2.2.tar.bz2
1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2
2ed80e90992e7455eaac4c3e977ebd01 xproto-7.0.10.tar.bz2
d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2
598bc9a493deee2e48e4434e94467189 renderproto-0.9.3.tar.bz2
a0f0d8cf6fbf0db8ba3937d0cc16138d inputproto-1.4.3.tar.bz2
388234421add6c1760b4fc99fcdc76b0 xproto-7.0.12.tar.bz2

View File

@ -10,7 +10,7 @@
Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel
Version: 7.3
Release: 7%{?dist}
Release: 8%{?dist}
License: MIT
Group: Development/System
URL: http://www.x.org
@ -32,8 +32,8 @@ Source6: ftp://ftp.x.org/pub/individual/proto/fontcacheproto-0.1.2.tar.bz2
Source7: ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
Source8: ftp://ftp.x.org/pub/individual/proto/glproto-1.4.9.tar.bz2
Provides: glproto = 1.4.9
Source9: ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.2.tar.bz2
Provides: inputproto = 1.4.2
Source9: ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.3.tar.bz2
Provides: inputproto = 1.4.3
Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
Provides: kbproto = 1.0.3
Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2
@ -56,12 +56,10 @@ Source25: ftp://ftp.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2
Provides: xproto = 7.0.10
Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.12.tar.bz2
Provides: xproto = 7.0.12
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
@ -84,8 +82,6 @@ X.Org X11 Protocol headers
%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
@ -298,6 +294,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/xproxymngproto.pc
%changelog
* Wed Mar 05 2008 Adam Jackson <ajax@redhat.com> 7.3-8
- inputproto 1.4.3
- xproto 7.0.12
* Tue Nov 13 2007 Adam Jackson <ajax@redhat.com> 7.3-7
- inputproto-1.4.2-card32.patch: Make sure CARD32 is defined on lp64.