[xorg-x11-proto-devel] xproto 7.0.21 0001-Add-XF86XK_TouchpadOn-Off.patch: drop, 5d3428de974d 0001-Add-defines-for-Unicode-

[Peter Hutterer]

commit ff9fbd2917ec26031f8c0f92ce623a0d0b0fd557
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Mar 23 12:04:00 2011 +1000

    xproto 7.0.21
    0001-Add-XF86XK_TouchpadOn-Off.patch: drop, 5d3428de974d
    0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: drop,
    423f5faddbb1023d

 .gitignore                                         |    1 +
 0001-Add-XF86XK_TouchpadOn-Off.patch               |   32 -----
 ...efines-for-Unicode-Sinhala-to-keysymdef.h.patch |  126 --------------------
 sources                                            |    1 +
 xorg-x11-proto-devel.spec                          |   18 ++--
 5 files changed, 10 insertions(+), 168 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 277a8e4..78038e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ inputproto-2.0.1.tar.bz2
 /randrproto-20110224-git105a161.tar.bz2
 /xextproto-7.2.0.tar.bz2
 /fixesproto-5.0.tar.bz2
+/xproto-7.0.21.tar.bz2
diff --git a/sources b/sources
index 5c1e42a..b81eabc 100644
--- a/sources
+++ b/sources
@@ -26,3 +26,4 @@ e793ecefeaecfeabd1aed6a01095174e  xf86vidmodeproto-2.3.1.tar.bz2
 700f8663c23713c2a81a6038a7d358f0  xproto-7.0.19.tar.bz2
 9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2
 e7431ab84d37b2678af71e29355e101d  fixesproto-5.0.tar.bz2
+c5a93a69b701cf81925fab02b35b0d0e  xproto-7.0.21.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index c78c3d1..7e6a22a 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -38,14 +38,11 @@ Source24: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1.
 Source25: http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2
 Source27: http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
 Source28: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2
-Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.19.tar.bz2
+Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.21.tar.bz2
 Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
 Source40: make-git-snapshot.sh
 
-Patch1: 0001-Add-XF86XK_TouchpadOn-Off.patch
-Patch2: 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -61,11 +58,6 @@ X.Org X11 Protocol headers
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
 
-pushd xproto-*
-%patch1 -p1 -b .xf86touchpad
-%patch2 -p1 -b .sinhala
-popd
-
 %build
 
 # Proceed through each proto package directory, building them all
@@ -274,6 +266,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Mar 23 2011 Peter Hutterer <peter.hutterer at redhat.com> 7.6-8
+- xproto 7.0.21
+- 0001-Add-XF86XK_TouchpadOn-Off.patch: drop, 5d3428de974d
+- 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: drop,
+  423f5faddbb1023d
+
 * Wed Mar 16 2011 Peter Hutterer <peter.hutterer at redhat.com> 7.6-7
 - 0001-Add-defines-for-Unicode-Sinhala-to-keysymdef.h.patch: add defines for
   Unicode Sinhala