rpms/xorg-x11/devel xorg-x11.spec,1.210,1.211

[fedora-cvs-commits redhat com]

Author: mharris

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

Modified Files:
	xorg-x11.spec 
Log Message:
- Disabled patches that are included in the above nv driver update patch:
  - xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
  - xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- xorg-x11.spec	5 Jul 2005 14:21:39 -0000	1.210
+++ xorg-x11.spec	5 Jul 2005 15:30:58 -0000	1.211
@@ -502,8 +502,11 @@
 Patch9702: xorg-x11-6.8.2-cursor-flicker.patch
 Patch9705: xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch
 Patch9706: xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch
+
+# Disabled 9707, 9708 as they're included in the nv driver update patch #1675
 Patch9707: xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
 Patch9708: xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
+
 Patch9709: xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch
 Patch9710: xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch
 Patch9711: xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch
@@ -1160,8 +1163,11 @@
 %patch9702 -p0 -b .cursor-flicker
 %patch9705 -p0 -b .iso8859-compose-files-fdo2592-2156
 %patch9706 -p0 -b .lbxproxy-fdo2678-2051
-%patch9707 -p0 -b .nv-hw-fdo2533-1896
-%patch9708 -p0 -b .nv-patch-fdo2380-1752
+
+# Disabled 9707, 9708 as they're included in the nv driver update patch #1675
+#%patch9707 -p0 -b .nv-hw-fdo2533-1896
+#%patch9708 -p0 -b .nv-patch-fdo2380-1752
+
 %patch9709 -p0 -b .radeon-cursor-sync-fdo2844-2230
 %patch9710 -p0 -b .radeon-render-byteswap-fdo2164-1863
 %patch9711 -p0 -b .radeon-set-fb-location-fdo2698-2079
@@ -3587,6 +3593,9 @@
 - Added xorg-x11-6.8.2-nv-driver-CVSHEAD-6.8.99.13.patch backport of CVS head
   nv driver to track the latest bug fixes and hardware support.  Hopefully
   this will also fix critical bug (#157715) also.
+- Disabled patches that are included in the above nv driver update patch:
+  - xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
+  - xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
 
 * Thu Jun 30 2005 Mike A. Harris <mharris redhat com> 6.8.2-40
 - Added xorg-x11-6.8.2-xkb-dutch-keyboard-layout-fixes.patch as a proposed