From 3456cbd222136eef4255939f43a99b33ba7dd60d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Jan 06 2011 15:40:32 +0000
Subject: post-7.6 proto releases


---

diff --git a/.gitignore b/.gitignore
index c1bfc97..d3f8c4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,47 @@ xextproto-7.1.2.tar.bz2
 videoproto-2.3.1.tar.bz2
 xproto-7.0.19.tar.bz2
 inputproto-2.0.1.tar.bz2
+/bigreqsproto-1.1.0.tar.bz2
+/compositeproto-0.4.1.tar.bz2
+/damageproto-1.2.0.tar.bz2
+/dmxproto-2.3.1.tar.bz2
+/dmxproto-2.3.tar.bz2
+/dri2proto-2.2.tar.bz2
+/dri2proto-2.3.tar.bz2
+/evieext-1.1.0.tar.bz2
+/evieext-1.1.1.tar.bz2
+/fixesproto-4.1.1.tar.bz2
+/fontsproto-2.1.0.tar.bz2
+/glproto-1.4.11.tar.bz2
+/glproto-1.4.12.tar.bz2
+/inputproto-2.0.1.tar.bz2
+/inputproto-2.0.tar.bz2
+/kbproto-1.0.4.tar.bz2
+/kbproto-1.0.5.tar.bz2
+/randrproto-1.3.1.tar.bz2
+/randrproto-1.3.2.tar.bz2
+/recordproto-1.14.1.tar.bz2
+/recordproto-1.14.tar.bz2
+/renderproto-0.11.1.tar.bz2
+/renderproto-0.11.tar.bz2
+/resourceproto-1.1.0.tar.bz2
+/scrnsaverproto-1.2.0.tar.bz2
+/scrnsaverproto-1.2.1.tar.bz2
+/videoproto-2.3.0.tar.bz2
+/videoproto-2.3.1.tar.bz2
+/xcmiscproto-1.2.0.tar.bz2
+/xcmiscproto-1.2.1.tar.bz2
+/xextproto-7.1.1.tar.bz2
+/xextproto-7.1.2.tar.bz2
+/xf86bigfontproto-1.2.0.tar.bz2
+/xf86dgaproto-2.1.tar.bz2
+/xf86driproto-2.1.0.tar.bz2
+/xf86driproto-2.1.1.tar.bz2
+/xf86miscproto-0.9.3.tar.bz2
+/xf86vidmodeproto-2.3.1.tar.bz2
+/xf86vidmodeproto-2.3.tar.bz2
+/xineramaproto-1.2.1.tar.bz2
+/xineramaproto-1.2.tar.bz2
+/xproto-7.0.17.tar.bz2
+/xproto-7.0.19.tar.bz2
+/xproxymanagementprotocol-1.0.3.tar.bz2
diff --git a/sources b/sources
index f9c1a1d..dcfaac1 100644
--- a/sources
+++ b/sources
@@ -1,32 +1,27 @@
 d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
 3692f3f8b2ea10dff3d2cede8dc65e79  compositeproto-0.4.1.tar.bz2
 434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
-880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
-5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
-f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
-70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
-84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
-9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2
-7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2
-120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
-a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
-309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
-4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
-a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
-a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
-4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
-ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
-9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2
-3ca8ddb42cd4ee31b8690031303221af  dri2proto-2.2.tar.bz2
+4ee175bbd44d05c34d43bb129be5098a  dmxproto-2.3.1.tar.bz2
 3407b494d5e90d584c9af52aa8f9f028  dri2proto-2.3.tar.bz2
+98bd86a13686f65f0873070fdee6efc7  evieext-1.1.1.tar.bz2
+4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
+f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
 55edc5ff2efb734215c868f72f7cf27e  glproto-1.4.12.tar.bz2
-a914ccc1de66ddeb4b611c6b0686e274  renderproto-0.11.1.tar.bz2
+da9bf9e5d174163f597d2d72757d9038  inputproto-2.0.1.tar.bz2
 e7edb59a3f54af15f749e8f3e314ee62  kbproto-1.0.5.tar.bz2
-263ae968b223c23b2986603d84e5c30e  xextproto-7.1.2.tar.bz2
-c3b348c6e2031b72b11ae63fc7f805c2  videoproto-2.3.1.tar.bz2
-cd7372cd827bfd7ca7e9238f2ce274b1  xcmiscproto-1.2.1.tar.bz2
 597491c0d8055e2a66f11350c4985775  randrproto-1.3.2.tar.bz2
-6af0f2e3369f5f74e69345e214f5fd0d  scrnsaverproto-1.2.1.tar.bz2
 24541a30b399213def35f48efd926c63  recordproto-1.14.1.tar.bz2
+a914ccc1de66ddeb4b611c6b0686e274  renderproto-0.11.1.tar.bz2
+84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
+6af0f2e3369f5f74e69345e214f5fd0d  scrnsaverproto-1.2.1.tar.bz2
+c3b348c6e2031b72b11ae63fc7f805c2  videoproto-2.3.1.tar.bz2
+cd7372cd827bfd7ca7e9238f2ce274b1  xcmiscproto-1.2.1.tar.bz2
+263ae968b223c23b2986603d84e5c30e  xextproto-7.1.2.tar.bz2
+120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
+a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
+1d716d0dac3b664e5ee20c69d34bc10e  xf86driproto-2.1.1.tar.bz2
+ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
+e793ecefeaecfeabd1aed6a01095174e  xf86vidmodeproto-2.3.1.tar.bz2
+9959fe0bfb22a0e7260433b8d199590a  xineramaproto-1.2.1.tar.bz2
 700f8663c23713c2a81a6038a7d358f0  xproto-7.0.19.tar.bz2
-da9bf9e5d174163f597d2d72757d9038  inputproto-2.0.1.tar.bz2
+9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 27e40be..b069fae 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -6,8 +6,8 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 7.5
-Release: 4%{?dist}
+Version: 7.6
+Release: 1%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -17,9 +17,9 @@ BuildArch: noarch
 Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
 Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.1.tar.bz2
 Source2:  http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
-Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.3.tar.bz2
+Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.3.1.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.3.tar.bz2
-Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
+Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.12.tar.bz2
@@ -35,10 +35,10 @@ Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.2.1.tar.bz2
 Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.2.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
-Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
+Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.1.tar.bz2
 Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.3.tar.bz2
-Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
+Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
+Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.1.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.19.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
@@ -87,9 +87,12 @@ for dir in $(ls -1) ; do
 	install -m 444 COPYING-${dir%%-*} $OLDPWD
 	popd
 done
-for i in composite damage fixes randr render ; do
-    mv $RPM_BUILD_ROOT%{_docdir}/${i}proto/${i}proto.txt .
-done
+
+mv $RPM_BUILD_ROOT%{_docdir}/*/*.{txt,html,xml} .
+
+#for i in composite damage fixes randr render ; do
+#    mv $RPM_BUILD_ROOT%{_docdir}/${i}proto/${i}proto.txt .
+#done
 mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
 
 %clean
@@ -98,34 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING-*
-%doc compositeproto.txt
-%doc damageproto.txt
-%doc fixesproto.txt
-%doc randrproto.txt
-%doc renderproto.txt
-%doc %{_docdir}/xextproto/appgroup.xml
-%doc %{_docdir}/xextproto/dbe.xml
-%doc %{_docdir}/xextproto/dpms.xml
-%doc %{_docdir}/xextproto/evi.xml
-%doc %{_docdir}/xextproto/geproto.xml
-%doc %{_docdir}/xextproto/multibuf.xml
-%doc %{_docdir}/xextproto/security.xml
-%doc %{_docdir}/xextproto/shape.xml
-%doc %{_docdir}/xextproto/shm.xml
-%doc %{_docdir}/xextproto/sync.xml
-%doc %{_docdir}/xextproto/tog-cup.xml
-%doc %{_docdir}/xextproto/xtest.xml
-%doc %{_docdir}/recordproto/record.xml
-%doc %{_docdir}/xcmiscproto/xc-misc.xml
-%doc %{_docdir}/scrnsaverproto/saver.xml
-%doc %{_docdir}/videoproto/xv-protocol-v2.txt
-%doc %{_docdir}/xproto/x11protocol.xml
-%doc %{_docdir}/xproto/encoding.xml
-%doc %{_docdir}/xproto/glossary.xml
-%doc %{_docdir}/xproto/keysyms.xml
-%doc %{_docdir}/xproto/sect1-9.xml
-%doc %{_docdir}/inputproto/XIproto.txt
-%doc %{_docdir}/inputproto/XI2proto.txt
+%doc *.txt
 %doc PM_spec
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
@@ -294,6 +270,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Jan 06 2011 Adam Jackson <ajax@redhat.com> 7.6-1
+- dmxproto 2.3.1
+- evieext 1.1.1
+- xf86driproto 2.1.1
+- xf86vidmodeproto 2.3.1
+- xineramaproto 1.2.1
+
 * Thu Nov 25 2010 Bastien Nocera <bnocera@redhat.com> 7.5-4
 - Add XF86XK_TouchpadOn/Off keysyms