From 3e8928cf7bfe83e7932a1b4d5ac61b1135ea5b79 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Jul 11 2007 19:33:26 +0000
Subject: compositeproto 0.4


---

diff --git a/.cvsignore b/.cvsignore
index 47c9bf3..dcac74e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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 @@ fixesproto-4.0.tar.bz2
 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 @@ xf86vidmodeproto-2.2.2.tar.bz2
 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
diff --git a/sources b/sources
index 82e944c..31c8e9b 100644
--- a/sources
+++ b/sources
@@ -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 @@ d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 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 @@ f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 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
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 0197fef..6631577 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -19,8 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # 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
@@ -101,7 +101,7 @@ for dir in $(ls -1) ; do
 	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
 
@@ -119,8 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -290,6 +291,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Jul 11 2007 Adam Jackson <ajax@redhat.com> 7.2-11
+- compositeproto 0.4
+
 * Wed Jul 11 2007 Adam Jackson <ajax@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