misc, and also other.

This commit is contained in:
Adam Jackson 2008-07-21 03:25:25 +00:00
parent 869c366789
commit b843408610
4 changed files with 51 additions and 94 deletions

View File

@ -5,26 +5,23 @@ dmxproto-2.2.2.tar.bz2
dri2proto-1.1.tar.bz2
evieext-1.0.2.tar.bz2
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.3.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
videoproto-2.2.2.tar.bz2
xcmiscproto-1.1.2.tar.bz2
xextproto-7.0.3.tar.bz2
xf86bigfontproto-1.1.2.tar.bz2
xf86dgaproto-2.0.3.tar.bz2
xf86driproto-2.0.4.tar.bz2
xf86miscproto-0.9.2.tar.bz2
xf86rushproto-1.1.2.tar.bz2
xf86vidmodeproto-2.2.2.tar.bz2
xineramaproto-1.1.2.tar.bz2
xproxymanagementprotocol-1.0.2.tar.bz2
xextproto-7.0.3.tar.bz2
xproto-7.0.13.tar.bz2
xproxymanagementprotocol-1.0.2.tar.bz2
randrproto-1.2.2.tar.bz2

View File

@ -1,21 +0,0 @@
diff -up inputproto-1.4.3/XI.h.jx inputproto-1.4.3/XI.h
--- inputproto-1.4.3/XI.h.jx 2008-03-05 22:05:38.000000000 -0500
+++ inputproto-1.4.3/XI.h 2008-04-01 15:53:46.000000000 -0400
@@ -52,8 +52,6 @@ SOFTWARE.
#ifndef _XI_H_
#define _XI_H_
-#include <X11/Xmd.h> /* CARD32 */
-
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32
#define sz_xListInputDevicesReq 4
@@ -268,7 +266,7 @@ SOFTWARE.
* See the top of X.h for more _XSERVER64 magic.
*/
#ifdef _XSERVER64
-typedef CARD32 XEventClass;
+typedef unsigned int XEventClass;
#else
typedef unsigned long XEventClass;
#endif

View File

@ -5,26 +5,23 @@ d80acad88411e7944b9b085463d53302 dmxproto-2.2.2.tar.bz2
1d70f0653b0b3a837853262dc5d34da4 dri2proto-1.1.tar.bz2
2507b5d0f4b2848147fbddd155aa6cfe evieext-1.0.2.tar.bz2
8b298cc3424597f8138c7faf7763dce9 fixesproto-4.0.tar.bz2
60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2
c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2
e60951628422663e60faeb400f27bac1 glproto-1.4.9.tar.bz2
a0f0d8cf6fbf0db8ba3937d0cc16138d inputproto-1.4.3.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
44292d74a9a3c94b1ecb9d77a0da83e8 videoproto-2.2.2.tar.bz2
fde0b050901f024b19159cdacdcfbd20 xcmiscproto-1.1.2.tar.bz2
3a2e0252e853ab30b3bff05ac92ec61c xextproto-7.0.3.tar.bz2
a318c1e86123832d7b0c95fc7d47ef35 xf86bigfontproto-1.1.2.tar.bz2
42fdcebc66efac02ab4beec2b1b0ad6e xf86dgaproto-2.0.3.tar.bz2
01470d088da3a8a3deefa8e1f45d69cb xf86driproto-2.0.4.tar.bz2
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
d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2
3a2e0252e853ab30b3bff05ac92ec61c xextproto-7.0.3.tar.bz2
7d26f45dca52632712a696e0631dc17b xproto-7.0.13.tar.bz2
d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2
0458f24d6a77ff4bc5182816f482afa1 randrproto-1.2.2.tar.bz2

View File

@ -9,8 +9,8 @@
Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel
Version: 7.3
Release: 13%{?dist}
Version: 7.4
Release: 1%{?dist}
License: MIT
Group: Development/System
URL: http://www.x.org
@ -19,51 +19,46 @@ BuildArch: noarch
# Add virtual provides lazily as they get updated, so the server and libs
# can depend on specific proto versions instead of this package's version.
Source0: ftp://ftp.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
Source1: ftp://ftp.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
Source0: http://www.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
Source1: http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
Provides: compositeproto = 0.4
Source2: ftp://ftp.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
Source2: http://www.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
Provides: damageproto = 1.1.0
Source3: ftp://ftp.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
Source4: ftp://ftp.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
Source5: ftp://ftp.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
Provides: fixesproto = 4.0
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.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
Provides: randrproto = 1.2.1
Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.9.3.tar.bz2
Provides: renderproto = 0.9.3
Source16: ftp://ftp.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
Source17: ftp://ftp.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
Provides: scrnsaverproto = 1.1.0
Source18: ftp://ftp.x.org/pub/individual/proto/trapproto-3.4.3.tar.bz2
Source19: ftp://ftp.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.0.3.tar.bz2
Provides: xextproto = 7.0.3
Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
Provides: xf86dgaproto = 2.0.3
Source24: ftp://ftp.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
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.13.tar.bz2
Provides: xproto = 7.0.13
Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-1.1.tar.bz2
Source3: http://www.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
Source31: http://www.x.org/pub/individual/proto/dri2proto-1.1.tar.bz2
Provides: dri2proto = 1.1
Patch0: inputproto-1.4.3-card32-sucks.patch
Source4: http://www.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
Source5: http://www.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
Provides: fixesproto = 4.0
Source7: http://www.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
Source8: http://www.x.org/pub/individual/proto/glproto-1.4.9.tar.bz2
Provides: glproto = 1.4.9
Source9: http://www.x.org/pub/individual/proto/inputproto-1.4.3.tar.bz2
Provides: inputproto = 1.4.3
Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
Provides: kbproto = 1.0.3
Source13: http://www.x.org/pub/individual/proto/randrproto-1.2.2.tar.bz2
Provides: randrproto = 1.2.2
Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
Source15: http://www.x.org/pub/individual/proto/renderproto-0.9.3.tar.bz2
Provides: renderproto = 0.9.3
Source16: http://www.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
Provides: scrnsaverproto = 1.1.0
Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
Source21: http://www.x.org/pub/individual/proto/xextproto-7.0.3.tar.bz2
Provides: xextproto = 7.0.3
Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
Provides: xf86dgaproto = 2.0.3
Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
Source29: http://www.x.org/pub/individual/proto/xproto-7.0.13.tar.bz2
Provides: xproto = 7.0.13
Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1
@ -85,8 +80,7 @@ Requires: pkgconfig
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 -a31
%patch0 -p0 -b .card32
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
%build
@ -211,9 +205,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/X11/extensions/dpmsstr.h
%{_includedir}/X11/extensions/dri2proto.h
%{_includedir}/X11/extensions/extutil.h
%{_includedir}/X11/extensions/fontcache.h
%{_includedir}/X11/extensions/fontcacheP.h
%{_includedir}/X11/extensions/fontcachstr.h
%{_includedir}/X11/extensions/ge.h
%{_includedir}/X11/extensions/geproto.h
%{_includedir}/X11/extensions/lbxstr.h
@ -248,21 +239,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/X11/extensions/xf86dgastr.h
%{_includedir}/X11/extensions/xf86misc.h
%{_includedir}/X11/extensions/xf86mscstr.h
%{_includedir}/X11/extensions/xf86rush.h
%{_includedir}/X11/extensions/xf86rushstr.h
%{_includedir}/X11/extensions/xf86vmode.h
%{_includedir}/X11/extensions/xf86vmstr.h
%{_includedir}/X11/extensions/xfixesproto.h
%{_includedir}/X11/extensions/xfixeswire.h
%{_includedir}/X11/extensions/xtestext1.h
%{_includedir}/X11/extensions/xteststr.h
%{_includedir}/X11/extensions/xtrapbits.h
%{_includedir}/X11/extensions/xtrapddmi.h
%{_includedir}/X11/extensions/xtrapdi.h
%{_includedir}/X11/extensions/xtrapemacros.h
%{_includedir}/X11/extensions/xtraplib.h
%{_includedir}/X11/extensions/xtraplibp.h
%{_includedir}/X11/extensions/xtrapproto.h
%dir %{_includedir}/X11/fonts
%{_includedir}/X11/fonts/FS.h
%{_includedir}/X11/fonts/FSproto.h
@ -279,7 +261,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/dri2proto.pc
%{_datadir}/pkgconfig/evieproto.pc
%{_datadir}/pkgconfig/fixesproto.pc
%{_datadir}/pkgconfig/fontcacheproto.pc
%{_datadir}/pkgconfig/fontsproto.pc
%{_datadir}/pkgconfig/glproto.pc
%{_datadir}/pkgconfig/inputproto.pc
@ -289,7 +270,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/renderproto.pc
%{_datadir}/pkgconfig/resourceproto.pc
%{_datadir}/pkgconfig/scrnsaverproto.pc
%{_datadir}/pkgconfig/trapproto.pc
%{_datadir}/pkgconfig/videoproto.pc
%{_datadir}/pkgconfig/xcmiscproto.pc
%{_datadir}/pkgconfig/xextproto.pc
@ -297,13 +277,17 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pkgconfig/xf86dgaproto.pc
%{_datadir}/pkgconfig/xf86driproto.pc
%{_datadir}/pkgconfig/xf86miscproto.pc
%{_datadir}/pkgconfig/xf86rushproto.pc
%{_datadir}/pkgconfig/xf86vidmodeproto.pc
%{_datadir}/pkgconfig/xineramaproto.pc
%{_datadir}/pkgconfig/xproto.pc
%{_datadir}/pkgconfig/xproxymngproto.pc
%changelog
* Sun Jul 20 2008 Adam Jackson <ajax@redhat.com> 7.4-1
- Magic superstition version number bump.
- Dropped: fontcacheproto, trapproto, xf86rushproto
- Updated: randrproto 1.2.2
* Tue Jun 10 2008 Adam Jackson <ajax@redhat.com> 7.3-13
- xproto 7.0.13
- xextproto 7.0.3