rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-xkb-in-xnest.patch, NONE, 1.1 xorg-x11-server.spec, 1.149, 1.150

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3285

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-xkb-in-xnest.patch 
Log Message:
* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)


xorg-x11-server-1.1.1-xkb-in-xnest.patch:
 miinitext.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-xkb-in-xnest.patch ---
--- xorg-server-1.1.1/mi/miinitext.c.xkb-in-xnest	2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/mi/miinitext.c	2006-08-17 22:57:27.000000000 -0400
@@ -595,7 +595,7 @@
 #ifdef XSYNC
     if (!noSyncExtension) SyncExtensionInit();
 #endif
-#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
+#if defined(XKB) && !defined(PRINT_ONLY_SERVER)
     if (!noXkbExtension) XkbExtensionInit();
 #endif
 #ifdef XCMISC


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- xorg-x11-server.spec	18 Aug 2006 00:52:50 -0000	1.149
+++ xorg-x11-server.spec	18 Aug 2006 14:41:13 -0000	1.150
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   22%{?dist}
+Release:   23%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -24,6 +24,7 @@
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 Patch5:    xorg-x11-server-libxf86config-dont-write-empty-sections.patch
 Patch6:    xorg-x11-server-1.1.1-builderstring.patch
+Patch7:    xorg-x11-server-1.1.1-xkb-in-xnest.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -329,6 +330,7 @@
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch5 -p0 -b .libxf86config-dont-write-empty-sections
 %patch6 -p1 -b .builderstring
+%patch7 -p1 -b .xkb-in-xnest
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -693,6 +695,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Aug 18 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-23.fc6
+- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)
+
 * Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-22.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
   are given in the config file, attempt to pick a sensible one by examining