rpms/xorg-x11-proto-devel/OLPC-2 .cvsignore, 1.27, 1.28 sources, 1.25, 1.26 xorg-x11-proto-devel.spec, 1.56, 1.57

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/xorg-x11-proto-devel/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26513/OLPC-2

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
import OLPC build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-proto-devel/OLPC-2/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Apr 2007 18:41:26 -0000	1.27
+++ .cvsignore	16 Nov 2007 20:54:16 -0000	1.28
@@ -1,5 +1,4 @@
 bigreqsproto-1.0.2.tar.bz2
-compositeproto-0.3.1.tar.bz2
 damageproto-1.1.0.tar.bz2
 dmxproto-2.2.2.tar.bz2
 evieext-1.0.2.tar.bz2
@@ -7,6 +6,7 @@
 fontcacheproto-0.1.2.tar.bz2
 fontsproto-2.0.2.tar.bz2
 glproto-1.4.8.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
@@ -26,4 +26,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-inputproto-1.4.2.tar.bz2
+compositeproto-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-proto-devel/OLPC-2/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	26 Apr 2007 18:41:26 -0000	1.25
+++ sources	16 Nov 2007 20:54:16 -0000	1.26
@@ -1,5 +1,4 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
-54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.tar.bz2
 33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
@@ -7,6 +6,7 @@
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 3dfbd17203c0c88b94b6f579f24c11cc  glproto-1.4.8.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
@@ -26,4 +26,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-e2c4cf4c2ad59d1e27f09381f6b4a3c3  inputproto-1.4.2.tar.bz2
+6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-proto-devel/OLPC-2/xorg-x11-proto-devel.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xorg-x11-proto-devel.spec	26 Apr 2007 18:41:26 -0000	1.56
+++ xorg-x11-proto-devel.spec	16 Nov 2007 20:54:16 -0000	1.57
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 9%{?dist}
+Release: 13%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -19,8 +19,8 @@
 # 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.3.1.tar.bz2
-Provides: compositeproto = 0.3.1
+Source1:  ftp://ftp.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
 Provides: damageproto = 1.1.0
 Source3:  ftp://ftp.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
@@ -69,6 +69,7 @@
 
 %if ! %{build_bootstrap}
 Requires: mesa-libGL-devel
+Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
@@ -97,9 +98,11 @@
 	install -m 444 COPYING-${dir%%-*} $OLDPWD
 	popd
 done
-for i in damage randr ; do
+for i in composite damage randr ; do
     mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
 done
+# this header is supposed to come from Mesa, not driproto
+rm -f $RPM_BUILD_ROOT/%{_includedir}/GL/internal/dri_interface.h
 
 # libXext still needs XLbx.h and lbxstr.h to build.  The rest are junk.
 rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxbuf.h \
@@ -115,8 +118,9 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING-*
-%doc randrproto.txt
+%doc compositeproto.txt
 %doc damageproto.txt
+%doc randrproto.txt
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -124,7 +128,6 @@
 %{_includedir}/GL/glxtokens.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/glcore.h
-%{_includedir}/GL/internal/dri_interface.h
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
@@ -286,6 +289,30 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Oct 01 2007 Bernardo Innocenti <bernie at codewiz.org> 7.3-13
+- Rebuild for OLPC
+
+* Thu Sep 27 2007 Adam Jackson <ajax at redhat.com> 7.3-2
+- Require libXau-devel when not doing arch bootstrap (#207391)
+
+* Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 7.3-1
+- dgaproto 2.0.3
+- Bump to 7.3
+
+* Wed Aug 29 2007 Adam Jackson <ajax at redhat.com> 7.2-13
+- Remove the horrible header hack, in favor of proper fix in xserver itself.
+
+* Tue Jul 24 2007 Adam Jackson <ajax at redhat.com> 7.2-12
+- Remove dri_interface.h.  It's not protocol, it belongs in Mesa.
+
+* Wed Jul 11 2007 Adam Jackson <ajax at redhat.com> 7.2-11
+- compositeproto 0.4
+
+* Wed Jul 11 2007 Adam Jackson <ajax at redhat.com> 7.2-10
+- inputproto-1.4.2-horrible-header-hack.patch: Re-add some #defines from
+  older inputproto to make old drivers build.  Do not commit this patch
+  upstream.
+
 * Thu Apr 26 2007 Adam Jackson <ajax at redhat.com> 7.2-9
 - inputproto 1.4.2