rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.162, 1.163 xorg-x11-server-1.1.0-gl-include-inferiors.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.1.0-gl-include-inferiors.patch 
Log Message:
* Wed Aug 30 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-32.fc6
- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
  compiz can uses the composite overlay window.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- xorg-x11-server.spec	28 Aug 2006 23:57:08 -0000	1.162
+++ xorg-x11-server.spec	30 Aug 2006 06:11:38 -0000	1.163
@@ -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:   31%{?dist}
+Release:   32%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -30,7 +30,6 @@
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
-Patch102:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
@@ -170,6 +169,9 @@
 Conflicts: xorg-x11-drv-ati < 6.6.1
 Conflicts: xorg-x11-drv-i810 < 1.6.0
 
+# Match up work-arounds between compiz and the xserver
+Conflicts: compiz < 0.0.13-0.20.20060817git.fc6
+
 %description
 X.Org X11 X server
 
@@ -341,7 +343,6 @@
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
-%patch102 -p0 -b .gl-include-inferiors
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
@@ -707,6 +708,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Aug 30 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-32.fc6
+- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
+  compiz can uses the composite overlay window.
+
 * Mon Aug 28 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-31.fc6
 - Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
 - Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to


--- xorg-x11-server-1.1.0-gl-include-inferiors.patch DELETED ---