From a4d330fea4bc3a6f646b69e02d93aa061ea5641a Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 16 Dec 2005 10:10:00 +0000
Subject: [PATCH] auto-import xorg-x11-proto-devel-0.99.4-1 on branch devel
 from     xorg-x11-proto-devel-0.99.4-1.src.rpm

---
 .cvsignore                | 60 ++++++++++++++++-----------------
 sources                   | 60 ++++++++++++++++-----------------
 xorg-x11-proto-devel.spec | 70 +++++++++++++++++++++------------------
 3 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9dc8693..c05bbf0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,30 +1,30 @@
-bigreqsproto-1.0.1.tar.bz2
-compositeproto-0.2.1.tar.bz2
-damageproto-1.0.1.tar.bz2
-dmxproto-2.2.1.tar.bz2
-evieext-1.0.1.tar.bz2
-fixesproto-3.0.1.tar.bz2
-fontcacheproto-0.1.1.tar.bz2
-fontsproto-2.0.1.tar.bz2
-glproto-1.4.1.tar.bz2
-inputproto-1.3.1.tar.bz2
-kbproto-1.0.1.tar.bz2
-randrproto-1.1.1.tar.bz2
-recordproto-1.13.1.tar.bz2
-renderproto-0.9.1.tar.bz2
-resourceproto-1.0.1.tar.bz2
-scrnsaverproto-1.0.1.tar.bz2
-videoproto-2.2.1.tar.bz2
-xcmiscproto-1.1.1.tar.bz2
-xextproto-7.0.1.tar.bz2
-xf86bigfontproto-1.1.1.tar.bz2
-xf86dgaproto-2.0.1.tar.bz2
-xf86driproto-2.0.1.tar.bz2
-xf86miscproto-0.9.1.tar.bz2
-xf86rushproto-1.1.1.tar.bz2
-xf86vidmodeproto-2.2.1.tar.bz2
-xineramaproto-1.1.1.tar.bz2
-xproxymanagementprotocol-1.0.1.tar.bz2
-printproto-1.0.2.tar.bz2
-trapproto-3.4.2.tar.bz2
-xproto-7.0.3.tar.bz2
+bigreqsproto-1.0.2.tar.bz2
+compositeproto-0.2.2.tar.bz2
+damageproto-1.0.2.tar.bz2
+dmxproto-2.2.2.tar.bz2
+evieext-1.0.2.tar.bz2
+fixesproto-3.0.2.tar.bz2
+fontcacheproto-0.1.2.tar.bz2
+fontsproto-2.0.2.tar.bz2
+glproto-1.4.2.tar.bz2
+inputproto-1.3.2.tar.bz2
+kbproto-1.0.2.tar.bz2
+printproto-1.0.3.tar.bz2
+randrproto-1.1.2.tar.bz2
+recordproto-1.13.2.tar.bz2
+renderproto-0.9.2.tar.bz2
+resourceproto-1.0.2.tar.bz2
+scrnsaverproto-1.0.2.tar.bz2
+trapproto-3.4.3.tar.bz2
+videoproto-2.2.2.tar.bz2
+xcmiscproto-1.1.2.tar.bz2
+xextproto-7.0.2.tar.bz2
+xf86bigfontproto-1.1.2.tar.bz2
+xf86dgaproto-2.0.2.tar.bz2
+xf86driproto-2.0.2.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
+xproto-7.0.4.tar.bz2
+xproxymanagementprotocol-1.0.2.tar.bz2
diff --git a/sources b/sources
index b34203f..dd8ba70 100644
--- a/sources
+++ b/sources
@@ -1,30 +1,30 @@
-fb5b31482d67661d29931d816736aa50  bigreqsproto-1.0.1.tar.bz2
-163f8e87555bcf9c402ae2be9d7ac7c3  compositeproto-0.2.1.tar.bz2
-ba4363b50409e53d5370f86f06ca8ae0  damageproto-1.0.1.tar.bz2
-4ad016fe64688c54730b47551e96f7c1  dmxproto-2.2.1.tar.bz2
-f20be452f3953ef3778982a669225115  evieext-1.0.1.tar.bz2
-dc3c1df35b16bfd673e55b83cab8b361  fixesproto-3.0.1.tar.bz2
-c603e10bbc73689f5bd4ffa5e24f3d29  fontcacheproto-0.1.1.tar.bz2
-ec23e17f0cb54b15ff31e846704c849f  fontsproto-2.0.1.tar.bz2
-dd439aa517177697d60d7ee6cdbc614f  glproto-1.4.1.tar.bz2
-6710bb1961bcceb099a1635c1f101016  inputproto-1.3.1.tar.bz2
-3506c6d4698afc5ecc9927cd06ab4329  kbproto-1.0.1.tar.bz2
-ea9b416b620041352a67670bac2cc017  randrproto-1.1.1.tar.bz2
-e858fe69ff4ce7bcdaa850d8a3631b17  recordproto-1.13.1.tar.bz2
-41b7006bb3de16df85380fa0309bb3fd  renderproto-0.9.1.tar.bz2
-2cd11f087cca67382808c5f64579bdf7  resourceproto-1.0.1.tar.bz2
-9f82f6ce451b0d2543af405c91631a73  scrnsaverproto-1.0.1.tar.bz2
-83245b434f77aeef2ba69b88153422a2  videoproto-2.2.1.tar.bz2
-e3e6ee6862982f2b2d7a0fc7f483869e  xcmiscproto-1.1.1.tar.bz2
-2ad511ee64710d58497f294fa3035423  xextproto-7.0.1.tar.bz2
-e93b1b833a0531e546bf6f4cfbde4786  xf86bigfontproto-1.1.1.tar.bz2
-a853ac74324824f259ce536ad2a43eea  xf86dgaproto-2.0.1.tar.bz2
-705f6b2ae275dce556689f7774770847  xf86driproto-2.0.1.tar.bz2
-4abf4c8338ae6319c14fb6661c4f35f0  xf86miscproto-0.9.1.tar.bz2
-eb2e5a127aa828b13c50b0f396f28f18  xf86rushproto-1.1.1.tar.bz2
-e125b82299fa2e9c955e2277744694c6  xf86vidmodeproto-2.2.1.tar.bz2
-dc7a13f4a128513ebad675b35eb36b58  xineramaproto-1.1.1.tar.bz2
-2951543a1d5687d54db825bac2bffaed  xproxymanagementprotocol-1.0.1.tar.bz2
-4157e786622f2d061edc82b91bff45e0  printproto-1.0.2.tar.bz2
-61645d301d27f0f9a3c3113a451f949c  trapproto-3.4.2.tar.bz2
-50752661e54fa922479c0ec5bea02316  xproto-7.0.3.tar.bz2
+0af2c8aa47f5ff24f1fc2a3f5f91fb17  bigreqsproto-1.0.2.tar.bz2
+4e067fec41f3a5ddef35d681823b664d  compositeproto-0.2.2.tar.bz2
+9b0b8b18259d67ec868336ca5bfd5228  damageproto-1.0.2.tar.bz2
+87b97f99016c7c0d7b5bfff02cb5dbc8  dmxproto-2.2.2.tar.bz2
+f4f22934941de43926bd39089461a680  evieext-1.0.2.tar.bz2
+f748f5b72294741ce1f1ca322f3e6ec1  fixesproto-3.0.2.tar.bz2
+9482258239fa5627045e82039e4879ed  fontcacheproto-0.1.2.tar.bz2
+aaf71f68f8f8cb418801e404c72243fa  fontsproto-2.0.2.tar.bz2
+784790c21e5566c6c2fb58ba95937271  glproto-1.4.2.tar.bz2
+6f02bfa0ea33e2a3473679208acb192c  inputproto-1.3.2.tar.bz2
+a7ad6233c3926af7c288c00370a7e2b9  kbproto-1.0.2.tar.bz2
+c685f456391bd21d3089b736d17d7132  printproto-1.0.3.tar.bz2
+ef7ee482a9816f7e9614efa6e13b1cb0  randrproto-1.1.2.tar.bz2
+67574f83e827a4b5680478a802f6555e  recordproto-1.13.2.tar.bz2
+4ea888582394a0c9862b2219c605797f  renderproto-0.9.2.tar.bz2
+8c58b7c060e86da3e09fd2fdaf5244e3  resourceproto-1.0.2.tar.bz2
+f5687667b79e8eade58c8d51a889f0b7  scrnsaverproto-1.0.2.tar.bz2
+dc33d19c787b05761742cded7d7d221f  trapproto-3.4.3.tar.bz2
+cf556cafa08a2b219af0245af5dec3fe  videoproto-2.2.2.tar.bz2
+beb1161680e6247265ae246c7861930e  xcmiscproto-1.1.2.tar.bz2
+b4c10b43fb3a33ee38bc606344f07b2e  xextproto-7.0.2.tar.bz2
+53fc47c5aa3937408cfce10837714e2f  xf86bigfontproto-1.1.2.tar.bz2
+5046ad055d42a4e1eed6446fa630cf35  xf86dgaproto-2.0.2.tar.bz2
+5c1c51f0603f65d5476e3245dd188b2f  xf86driproto-2.0.2.tar.bz2
+f0f59524ce1e012d2a64bb6784c9bf8a  xf86miscproto-0.9.2.tar.bz2
+773b6de09c0f7aa1c2c48fb3b612d993  xf86rushproto-1.1.2.tar.bz2
+f18d93c1d35ec3a4b93290f54c92cca7  xf86vidmodeproto-2.2.2.tar.bz2
+aedc285fffda0dd9d3df98b42f3dfe2d  xineramaproto-1.1.2.tar.bz2
+f15b8704acc4af8b67fba5ef46b6b1cb  xproto-7.0.4.tar.bz2
+730fa5beb16a913b92ef9808dcb6807e  xproxymanagementprotocol-1.0.2.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index ec2b1e4..6151266 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -5,60 +5,61 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 0.99.3
+Version: 0.99.4
 Release: 1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
 %define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything
-Source0:  %{sourceurl}/bigreqsproto-1.0.1.tar.bz2
-Source1:  %{sourceurl}/compositeproto-0.2.1.tar.bz2
-Source2:  %{sourceurl}/damageproto-1.0.1.tar.bz2
-Source3:  %{sourceurl}/dmxproto-2.2.1.tar.bz2
-Source4:  %{sourceurl}/evieext-1.0.1.tar.bz2
-Source5:  %{sourceurl}/fixesproto-3.0.1.tar.bz2
-Source6:  %{sourceurl}/fontcacheproto-0.1.1.tar.bz2
-Source7:  %{sourceurl}/fontsproto-2.0.1.tar.bz2
-Source8:  %{sourceurl}/glproto-1.4.1.tar.bz2
-Source9:  %{sourceurl}/inputproto-1.3.1.tar.bz2
-Source10: %{sourceurl}/kbproto-1.0.1.tar.bz2
+Source0:  %{sourceurl}/bigreqsproto-1.0.2.tar.bz2
+Source1:  %{sourceurl}/compositeproto-0.2.2.tar.bz2
+Source2:  %{sourceurl}/damageproto-1.0.2.tar.bz2
+Source3:  %{sourceurl}/dmxproto-2.2.2.tar.bz2
+Source4:  %{sourceurl}/evieext-1.0.2.tar.bz2
+Source5:  %{sourceurl}/fixesproto-3.0.2.tar.bz2
+Source6:  %{sourceurl}/fontcacheproto-0.1.2.tar.bz2
+Source7:  %{sourceurl}/fontsproto-2.0.2.tar.bz2
+Source8:  %{sourceurl}/glproto-1.4.2.tar.bz2
+Source9:  %{sourceurl}/inputproto-1.3.2.tar.bz2
+Source10: %{sourceurl}/kbproto-1.0.2.tar.bz2
 # NOTE: What once was known as PanoramiX, is now known as Xinerama
 #Source11: %{sourceurl}/panoramixproto-1.1.tar.bz2
-Source12: %{sourceurl}/printproto-1.0.2.tar.bz2
-Source13: %{sourceurl}/randrproto-1.1.1.tar.bz2
-Source14: %{sourceurl}/recordproto-1.13.1.tar.bz2
-Source15: %{sourceurl}/renderproto-0.9.1.tar.bz2
-Source16: %{sourceurl}/resourceproto-1.0.1.tar.bz2
-Source17: %{sourceurl}/scrnsaverproto-1.0.1.tar.bz2
-Source18: %{sourceurl}/trapproto-3.4.2.tar.bz2
-Source19: %{sourceurl}/videoproto-2.2.1.tar.bz2
-Source20: %{sourceurl}/xcmiscproto-1.1.1.tar.bz2
-Source21: %{sourceurl}/xextproto-7.0.1.tar.bz2
-Source22: %{sourceurl}/xf86bigfontproto-1.1.1.tar.bz2
-Source23: %{sourceurl}/xf86dgaproto-2.0.1.tar.bz2
-Source24: %{sourceurl}/xf86driproto-2.0.1.tar.bz2
-Source25: %{sourceurl}/xf86miscproto-0.9.1.tar.bz2
-Source26: %{sourceurl}/xf86rushproto-1.1.1.tar.bz2
-Source27: %{sourceurl}/xf86vidmodeproto-2.2.1.tar.bz2
-Source28: %{sourceurl}/xineramaproto-1.1.1.tar.bz2
-Source29: %{sourceurl}/xproto-7.0.3.tar.bz2
-Source30: %{sourceurl}/xproxymanagementprotocol-1.0.1.tar.bz2
+Source12: %{sourceurl}/printproto-1.0.3.tar.bz2
+Source13: %{sourceurl}/randrproto-1.1.2.tar.bz2
+Source14: %{sourceurl}/recordproto-1.13.2.tar.bz2
+Source15: %{sourceurl}/renderproto-0.9.2.tar.bz2
+Source16: %{sourceurl}/resourceproto-1.0.2.tar.bz2
+Source17: %{sourceurl}/scrnsaverproto-1.0.2.tar.bz2
+Source18: %{sourceurl}/trapproto-3.4.3.tar.bz2
+Source19: %{sourceurl}/videoproto-2.2.2.tar.bz2
+Source20: %{sourceurl}/xcmiscproto-1.1.2.tar.bz2
+Source21: %{sourceurl}/xextproto-7.0.2.tar.bz2
+Source22: %{sourceurl}/xf86bigfontproto-1.1.2.tar.bz2
+Source23: %{sourceurl}/xf86dgaproto-2.0.2.tar.bz2
+Source24: %{sourceurl}/xf86driproto-2.0.2.tar.bz2
+Source25: %{sourceurl}/xf86miscproto-0.9.2.tar.bz2
+Source26: %{sourceurl}/xf86rushproto-1.1.2.tar.bz2
+Source27: %{sourceurl}/xf86vidmodeproto-2.2.2.tar.bz2
+Source28: %{sourceurl}/xineramaproto-1.1.2.tar.bz2
+Source29: %{sourceurl}/xproto-7.0.4.tar.bz2
+Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # FIXME: This buildreq on xorg-x11-filesystem isn't really necessary, and
 # can be removed in the future.  The main purpose of it being here right
 # now, is to force buildmachines to get updated to solve the dir/symlink
 # issue.
-BuildRequires: xorg-x11-filesystem >= 0.99.2-1
+BuildRequires: xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
 # a nasty upgrade problem when going from FC4->FC5 or monolithic to
 # modular X.Org.  Bug #173384.
-Requires(pre): xorg-x11-filesystem >= 0.99.2-1
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 %description
 X.Org X11 Protocol headers
@@ -270,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Dec 15 2005 Mike A. Harris <mharris@redhat.com> 0.99.4-1
+- Update all proto tarballs to the RC4 release.
+
 * Wed Dec  7 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
 - Update to printproto-1.0.2, trapproto-3.4.2, xproto-7.0.3 from the
   X11R7 RC3 release.