rpms/xorg-x11-proto-devel/devel .cvsignore, 1.45, 1.46 sources, 1.44, 1.45 xorg-x11-proto-devel.spec, 1.89, 1.90 x11proto-7.0.14-XF86XK_Suspend.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28174

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Removed Files:
	x11proto-7.0.14-XF86XK_Suspend.patch 
Log Message:
* Tue Mar 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-14
- xproto 7.0.15
- Purge x11proto-7.0.14-XF86XK_Suspend.patch.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	20 Dec 2008 09:42:59 -0000	1.45
+++ .cvsignore	3 Mar 2009 03:59:31 -0000	1.46
@@ -22,7 +22,7 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	20 Dec 2008 09:42:59 -0000	1.44
+++ sources	3 Mar 2009 03:59:31 -0000	1.45
@@ -21,7 +21,7 @@
 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


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- xorg-x11-proto-devel.spec	26 Feb 2009 11:31:00 -0000	1.89
+++ xorg-x11-proto-devel.spec	3 Mar 2009 03:59:31 -0000	1.90
@@ -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 @@
 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 @@
 %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 @@
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Mar 03 2009 Peter Hutterer <peter.hutterer at 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 at lists.fedoraproject.org> - 7.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- x11proto-7.0.14-XF86XK_Suspend.patch DELETED ---