rpms/xorg-x11/devel xorg-x11.spec,1.220,1.221

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	xorg-x11.spec 
Log Message:
* Fri Jul 29 2005 Kristian Høgsberg <krh at redhat.com> 6.8.2-45
- Disable xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch and
  rebuild with gcc-4.0.1-4 which has a workaround for the gcc
  over-optimization bug.




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- xorg-x11.spec	27 Jul 2005 23:47:43 -0000	1.220
+++ xorg-x11.spec	29 Jul 2005 17:11:16 -0000	1.221
@@ -18,7 +18,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 44
+Release: 45
 #Release: 1.FC3.41
 #Release: ?.FC4.41
 
@@ -1188,7 +1188,11 @@
 %patch9720 -p0 -b .gcc4-fix
 %patch9721 -p0 -b .xnest-update-modifier-state-fdo3030-fdo3664
 %patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513
-%patch9723 -p0 -b .libvgahw-workaround-rh161242
+
+# gcc-4.0.1-4 has a workaround for the volatile over-optimization so
+# disable this patch for now.
+# %patch9723 -p0 -b .libvgahw-workaround-rh161242
+
 %endif
 
 ########################################################################
@@ -3599,6 +3603,11 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri Jul 29 2005 Kristian Høgsberg <krh at redhat.com> 6.8.2-45
+- Disable xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch and
+  rebuild with gcc-4.0.1-4 which has a workaround for the gcc
+  over-optimization bug.
+
 * Wed Jul 27 2005 Kristian Høgsberg <krh at redhat.com> 6.8.2-44
 - Update xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch to
   fix all occurrences of direct PCI config space access.  Fixes from