From e63604f4edc1515deb5c1cbcebddec7dfcb1a45f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 15 Mar 2011 10:15:50 -0400
Subject: [PATCH] fixesproto 5.0

---
 .gitignore                |  1 +
 sources                   |  1 +
 xorg-x11-proto-devel.spec | 17 ++++++-----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e8d936..277a8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,4 @@ inputproto-2.0.1.tar.bz2
 /xextproto-20110224-git9df8b77.tar.bz2
 /randrproto-20110224-git105a161.tar.bz2
 /xextproto-7.2.0.tar.bz2
+/fixesproto-5.0.tar.bz2
diff --git a/sources b/sources
index b347548..5c1e42a 100644
--- a/sources
+++ b/sources
@@ -25,3 +25,4 @@ e793ecefeaecfeabd1aed6a01095174e  xf86vidmodeproto-2.3.1.tar.bz2
 9959fe0bfb22a0e7260433b8d199590a  xineramaproto-1.2.1.tar.bz2
 700f8663c23713c2a81a6038a7d358f0  xproto-7.0.19.tar.bz2
 9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2
+e7431ab84d37b2678af71e29355e101d  fixesproto-5.0.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 88a6345..2a82820 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,11 +7,10 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 Source0:  http://xorg.freedesktop.org/archive/individual/proto/bigreqsproto-1.1.0.tar.bz2
@@ -20,7 +19,7 @@ Source2:  http://xorg.freedesktop.org/archive/individual/proto/damageproto-1.2.0
 Source3:  http://xorg.freedesktop.org/archive/individual/proto/dmxproto-2.3.1.tar.bz2
 Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-2.3.tar.bz2
 Source4:  http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar.bz2
-Source5:  http://xorg.freedesktop.org/archive/individual/proto/fixesproto-4.1.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2
 Source7:  http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.12.tar.bz2
 Source9:  http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.0.1.tar.bz2
@@ -46,8 +45,6 @@ Source40: make-git-snapshot.sh
 
 Patch1: 0001-Add-XF86XK_TouchpadOn-Off.patch
 
-Patch10: 0001-fixesproto-v5-Pointer-barriers.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -57,8 +54,6 @@ Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
-Conflicts: libXxf86dga-devel < 1.1
-
 %description
 X.Org X11 Protocol headers
 
@@ -69,10 +64,6 @@ pushd xproto-*
 %patch1 -p1 -b .xf86touchpad
 popd
 
-pushd fixesproto-*
-%patch10 -p1 -b .barriers
-popd
-
 %build
 
 # Proceed through each proto package directory, building them all
@@ -281,6 +272,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Mar 15 2011 Adam Jackson <ajax@redhat.com> 7.6-6
+- fixesproto 5.0
+- Drop libXxf86dga Conflicts, not relevant since at least F12.
+
 * Mon Feb 28 2011 Adam Jackson <ajax@redhat.com> 7.6-5
 - 0001-fixesproto-v5-Pointer-barriers.patch: from git.