From d61953d8637d628bc9b1f54af677e3983b138b62 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Mon, 26 Feb 2007 17:26:56 +0000
Subject: [PATCH] auto-import xorg-x11-proto-devel-7.2-3.fc7 on branch devel
 from     xorg-x11-proto-devel-7.2-3.fc7.src.rpm

---
 .cvsignore                |  4 ++--
 sources                   |  4 ++--
 xorg-x11-proto-devel.spec | 14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9257208..d7e49ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,5 @@
 bigreqsproto-1.0.2.tar.bz2
 compositeproto-0.3.1.tar.bz2
-damageproto-1.0.3.tar.bz2
 dmxproto-2.2.2.tar.bz2
 evieext-1.0.2.tar.bz2
 fixesproto-4.0.tar.bz2
@@ -9,6 +8,7 @@ fontsproto-2.0.2.tar.bz2
 glproto-1.4.8.tar.bz2
 inputproto-1.3.2.tar.bz2
 kbproto-1.0.3.tar.bz2
+randrproto-1.2.1.tar.bz2
 recordproto-1.13.2.tar.bz2
 renderproto-0.9.2.tar.bz2
 resourceproto-1.0.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
-randrproto-1.2.1.tar.bz2
+damageproto-1.1.0.tar.bz2
diff --git a/sources b/sources
index f3b5e35..f0f63fa 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,5 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
 54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.tar.bz2
-b3eaee9850bb23020b9ac751626c7976  damageproto-1.0.3.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
 8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
@@ -9,6 +8,7 @@ c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 3dfbd17203c0c88b94b6f579f24c11cc  glproto-1.4.8.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
+e2e45564f8ce22e00e1360e79c8ccdeb  randrproto-1.2.1.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
 28fbe8a59ebd31f098b90ec64f3d133a  renderproto-0.9.2.tar.bz2
 b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.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
-e2e45564f8ce22e00e1360e79c8ccdeb  randrproto-1.2.1.tar.bz2
+33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index b4a85ed..1716763 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: 2%{?dist}
+Release: 3%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
-Source2:  ftp://ftp.x.org/pub/individual/proto/damageproto-1.0.3.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
 Source5:  ftp://ftp.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
@@ -48,11 +48,6 @@ Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.ta
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
-# 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-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -72,7 +67,6 @@ X.Org X11 Protocol headers
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
 %build
-#ls -al
 
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
@@ -105,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc
 %{_docdir}/randrproto/randrproto.txt
+%{_docdir}/damageproto/damageproto.txt
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -274,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Feb 23 2007 Adam Jackson <ajax@redhat.com> 7.2-3
+- damageproto 1.1.0
+
 * Mon Feb 19 2007 Adam Jackson <ajax@redhat.com> 7.2-2
 - randrproto 1.2.1