From 944fe47f3d458f8a403910c437f2d37645dde5b0 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Feb 16 2006 23:11:59 +0000
Subject: - Update to glproto-1.4.4

- Drop glproto-texture-from-drawable patch, which is integrated now.

---

diff --git a/.cvsignore b/.cvsignore
index a85ca23..e747f48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -28,3 +28,4 @@ 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
diff --git a/sources b/sources
index d3c7b79..7ba9496 100644
--- a/sources
+++ b/sources
@@ -6,7 +6,7 @@ d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 cc8916ab773525e9d16061edbd1c2472  fixesproto-3.0.2.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
-5512bec5613ae5e00995eba5075a2115  glproto-1.4.3.tar.bz2
+151a7df5535157bcdd92e47dbddd13aa  glproto-1.4.4.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 3a5aa3b..f7fa9be 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -6,11 +6,11 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 2.3
+Release: 3
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-%define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything
+%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
 Source2:  %{sourceurl}/damageproto-1.0.3.tar.bz2
@@ -19,7 +19,7 @@ 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.3.tar.bz2
+Source8:  %{sourceurl}/glproto-1.4.4.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
@@ -44,8 +44,6 @@ Source28: %{sourceurl}/xineramaproto-1.1.2.tar.bz2
 Source29: %{sourceurl}/xproto-7.0.4.tar.bz2
 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
 
-Patch1: glproto-texture-from-drawable.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -69,11 +67,6 @@ X.Org X11 Protocol headers
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
-# Sigh... /me wants %patch to understand -d
-# pushd glproto-1.4.3
-# %patch1 -p0 -b .glproto-texture-from-drawable
-# popd
-
 %build
 #ls -al
 
@@ -245,7 +238,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/fonts/fsmasks.h
 %{_includedir}/X11/keysym.h
 %{_includedir}/X11/keysymdef.h
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/bigreqsproto.pc
 %{_libdir}/pkgconfig/compositeproto.pc
 %{_libdir}/pkgconfig/damageproto.pc
@@ -278,10 +270,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 7.0-2.3
+* Thu Feb 16 2006 Mike A. Harris <mharris@redhat.com> 7.0-3
+- Update to glproto-1.4.4
+- Drop glproto-texture-from-drawable patch, which is integrated now.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 7.0-2.3
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 7.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 7.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 27 2006 Kristian Høgsberg <krh@redhat.com> 7.0-2