From d7b568bc123c58e950cf374c042c09aa2d97115a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Mar 20 2006 14:22:55 +0000
Subject: auto-import xorg-x11-proto-devel-7.0-7 on branch devel from

    xorg-x11-proto-devel-7.0-7.src.rpm

---

diff --git a/.cvsignore b/.cvsignore
index ae23beb..6dd60f7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,12 +1,9 @@
 bigreqsproto-1.0.2.tar.bz2
-compositeproto-0.2.2.tar.bz2
 damageproto-1.0.3.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.3.tar.bz2
 inputproto-1.3.2.tar.bz2
 kbproto-1.0.2.tar.bz2
 printproto-1.0.3.tar.bz2
@@ -28,5 +25,6 @@ xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.4.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-glproto-1.4.4.tar.bz2
-glproto-1.4.5.tar.bz2
+compositeproto-0.3.tar.bz2
+fixesproto-4.0.tar.bz2
+glproto-1.4.6.tar.bz2
diff --git a/sources b/sources
index 2518ddb..675711d 100644
--- a/sources
+++ b/sources
@@ -1,12 +1,9 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
-a590eb95951567f3b371c70531fa2e87  compositeproto-0.2.2.tar.bz2
 b3eaee9850bb23020b9ac751626c7976  damageproto-1.0.3.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
-cc8916ab773525e9d16061edbd1c2472  fixesproto-3.0.2.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
-bf3f623303876f0708b692eedd55d1a0  glproto-1.4.5.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2
@@ -28,3 +25,6 @@ f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 9b7c807841c28289151f911fc1bea707  xproto-7.0.4.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
+85e7abb79de5b49cb83524a608744b0b  compositeproto-0.3.tar.bz2
+8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
+b30bff86821f0636563289e5911c74c6  glproto-1.4.6.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index fc24836..47ed679 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -10,20 +10,20 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 6
+Release: 7
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
 %define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0/src/everything
 Source0:  %{sourceurl}/bigreqsproto-1.0.2.tar.bz2
-Source1:  %{sourceurl}/compositeproto-0.2.2.tar.bz2
+Source1:  %{sourceurl}/compositeproto-0.3.tar.bz2
 Source2:  %{sourceurl}/damageproto-1.0.3.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
+Source5:  %{sourceurl}/fixesproto-4.0.tar.bz2
 Source6:  %{sourceurl}/fontcacheproto-0.1.2.tar.bz2
 Source7:  %{sourceurl}/fontsproto-2.0.2.tar.bz2
-Source8:  %{sourceurl}/glproto-1.4.5.tar.bz2
+Source8:  %{sourceurl}/glproto-1.4.6.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
@@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Mar 15 2006 Adam Jackson <ajackson@redhat.com> 7.0-7
+- Update to fixesproto-4.0, compositeproto-0.3, and glproto-1.4.6
+
 * Wed Mar 01 2006 Mike A. Harris <mharris@redhat.com> 7.0-6
 - Update to glproto-1.4.5
 - Remove xorg-x11-proto-devel-7.0-buffer-values.patch which is in 1.4.5.