rpms/xorg-x11-server/FC-6 xorg-x11-server-1.1.1-xf86config-comment-less.patch, NONE, 1.1 xorg-x11-server.spec, 1.183, 1.184

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-xf86config-comment-less.patch 
Log Message:
* Tue Dec 5 2006 Adam Jackson <ajax at redhat.com> 1.1.1-47.3.fc6
- xorg-x11-server-1.1.1-xf86config-comment-less.patch: Added, makes
  pyxf86config not grow the config file every time it's run.


xorg-x11-server-1.1.1-xf86config-comment-less.patch:
 Monitor.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-xf86config-comment-less.patch ---
--- xorg-server-1.1.1/hw/xfree86/parser/Monitor.c.comment-less	2006-07-05 14:31:41.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/parser/Monitor.c	2006-11-27 15:59:53.000000000 -0500
@@ -675,8 +675,6 @@
 			fprintf (cf, "\tDisplaySize  %d\t%d\n",
 					 ptr->mon_width,
 					 ptr->mon_height);
-		if ( ptr->mon_n_hsync || ptr->mon_n_vrefresh )
-		    fprintf(cf," ### Comment all HorizSync and VertSync values to use DDC:\n");
 		for (i = 0; i < ptr->mon_n_hsync; i++)
 		{
 			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- xorg-x11-server.spec	1 Dec 2006 20:48:58 -0000	1.183
+++ xorg-x11-server.spec	5 Dec 2006 17:14:59 -0000	1.184
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.2%{?dist}
+Release:   47.3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -48,6 +48,7 @@
 Patch1004:  xorg-x11-server-1.1.1-selinux-awareness.patch
 Patch1005:  xorg-x11-server-1.1.1-builtin-fonts.patch
 Patch1006:  xorg-x11-server-1.1.1-int10-muxing.patch
+Patch1007:  xorg-x11-server-1.1.1-xf86config-comment-less.patch
 
 # Backports of post-1.1 stuff.
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
@@ -371,6 +372,7 @@
 %patch1004 -p1 -b .selinux-awareness
 %patch1005 -p0 -b .builtin-fonts
 %patch1006 -p1 -b .int10-mux
+%patch1007 -p1 -b .comment-less
 
 %patch2001 -p1 -b .pci-scan
 %patch2004 -p1 -b .zlib
@@ -728,6 +730,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Dec 5 2006 Adam Jackson <ajax at redhat.com> 1.1.1-47.3.fc6
+- xorg-x11-server-1.1.1-xf86config-comment-less.patch: Added, makes
+  pyxf86config not grow the config file every time it's run.
+
 * Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-47.2.fc6
 - xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
   XKB actions to be case-insensitive again.  (#216656)