- xproto 7.0.15

- Purge x11proto-7.0.14-XF86XK_Suspend.patch.

.cvsignore

@@ -22,7 +22,7 @@ xf86driproto-2.0.4.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
 xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
-xproto-7.0.14.tar.bz2
+xproto-7.0.15.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
 randrproto-1.2.99.3.tar.bz2
 dri2proto-1.99.3.tar.bz2

sources

@@ -21,7 +21,7 @@ a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
-5bbf47f4ad6eb3b3f3a119231abe8e5e  xproto-7.0.14.tar.bz2
+1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 d4a7b90d826dfa1c39d41d323ce7366c  randrproto-1.2.99.3.tar.bz2
 fffbbb3c26368ac63d408e81c51ec374  dri2proto-1.99.3.tar.bz2

x11proto-7.0.14-XF86XK_Suspend.patch

@@ -1,47 +0,0 @@
-From 1e33337d4dd151da4f0898a86608a1ee67588163 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Oct 2008 16:36:34 +1030
-Subject: [PATCH] Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.
-
-At the moment, we have the following keysyms defined to put a computer into a
-sleep state:
-
-XF86XK_Standby    0x1008FF10   /* System into standby mode   */
-XF86XK_PowerDown  0x1008FF21   /* Deep sleep the system      */
-XF86XK_Sleep      0x1008FF2F   /* Put system to sleep        */
-
-Proposed change by Richard Hughes:
-    "The nomenclature I've been trying to make stick
-    (most projects now use this) for a few years now is:
-
-    standby: high sleep state, nobody uses this any more
-    hibernate: sleep to disk - slow, but can remove power
-    suspend: sleep to ram - fast, but can't remove power
-    hybrid sleep: sleep to both, slow, and can remove power, but quick to
-    resume if you don't - most users don't use this"
-
-This patch adds XF86XK_Suspend and XF86XK_Hibernate. The behaviour of
-XF86XK_Sleep can then be configured on a per-session basis.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
----
- XF86keysym.h |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git xproto-7.0.14/XF86keysym.h xproto-7.0.14/XF86keysym.h
-index 2a39f4e..072807e 100644
---- xproto-7.0.14/XF86keysym.h
-+++ xproto-7.0.14/XF86keysym.h
-@@ -206,6 +206,9 @@
- #define XF86XK_Yellow		0x1008FFA5   /* Yellow button               */
- #define XF86XK_Blue             0x1008FFA6   /* Blue button                 */
- 
-+#define XF86XK_Suspend		0x1008FFA7   /* Sleep to RAM                */
-+#define XF86XK_Hibernate	0x1008FFA8   /* Sleep to disk               */
-+
- /* Keys for special action keys (hot keys) */
- /* Virtual terminals on some operating systems */
- #define XF86XK_Switch_VT_1	0x1008FE01
--- 
-1.6.0.3
-

xorg-x11-proto-devel.spec

@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -39,12 +39,9 @@ Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
 Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
-Source29: http://www.x.org/pub/individual/proto/xproto-7.0.14.tar.bz2
+Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
-# Pushed upstream, will be x11proto-7.0.15
-Patch1: x11proto-7.0.14-XF86XK_Suspend.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -60,8 +57,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
 
-%patch1 -p0 -b .xf86suspend
-
 %build
 
 # Proceed through each proto package directory, building them all
@@ -264,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Mar 03 2009 Peter Hutterer <peter.hutterer@redhat.com> 7.4-14
+- xproto 7.0.15
+- Purge x11proto-7.0.14-XF86XK_Suspend.patch.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild