rpms/xorg-x11/devel xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch, NONE, 1.1 xorg-x11.spec, 1.175, 1.176

Mon Apr 11 00:57:28 UTC 2005

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

Modified Files:
	xorg-x11.spec 
Added Files:
	xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch 
Log Message:
- Added xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch
  to fix bug (#69335)
- Removed dead XFree86-4.2.99.901-parallelmake.patch as it has not worked for
  several X releases and is unmaintained.



xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch:
 xorg.conf.man |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch ---
Patch by Mike A. Harris <mharris at redhat.com> to fix manpage to not refer
to a nonexisting example config file.  The example was removed a number
of releases back, as users used some of the example configuration
contained within.  It was easier to remove the bad example than to
continuously field bogus bug reports caused by users editing their
config file based on the information in the bad example config.

The config file manpage still refers to the example config file
however, which was reported to us as a bug.  This patch removes the
reference from that manpage, to fix the bug.

Fixes bug:
	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=69335


--- xc/programs/Xserver/hw/xfree86/xorg.conf.man.examplefile	2005-04-10 20:33:36.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/xorg.conf.man	2005-04-10 20:34:06.000000000 -0400
@@ -1821,10 +1821,6 @@
 .B Option
 flags.  The data therein is not used in this release.
 .PP
-.SH FILES
-For an example of an __xconfigfile__ file, see the file installed as
-__projectroot__/lib/X11/__xconfigfile__.eg.
-.fi
 .SH "SEE ALSO"
 X(__miscmansuffix__),
 Xserver(__appmansuffix__),


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- xorg-x11.spec	7 Apr 2005 12:55:40 -0000	1.175
+++ xorg-x11.spec	11 Apr 2005 00:57:26 -0000	1.176
@@ -21,7 +21,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 20
+Release: 21
 #Release: 1.FC3.10test
 #Release: 0.%{cvs_release}.0
 
@@ -468,7 +468,6 @@
 Patch9323: xorg-x11-6.8.1.902-lnxLib-tmpl-sharedlibreq-fixes.patch
 
 Patch9324: xorg-x11-6.8.1-composite-gravity.patch
-Patch9325: xorg-x11-6.8.2-gcc4-fix.patch
 Patch9326: xorg-x11-6.8.2-ati-radeon-disable-broken-renderaccel-by-default.patch
 Patch9327: xorg-x11-6.8.2-ati-radeon-gcc4-fix.patch
 Patch9328: xorg-x11-6.8.2-fix-font-crash.patch
@@ -476,6 +475,7 @@
 Patch9330: xorg-x11-6.8.2-config-StaticNeedsPicForShared.patch
 Patch9331: xorg-x11-6.8.2-XScreenSaverQueryInfo-crash-fix.patch
 Patch9333: XFree86-4.1.0-xpm-security-fix-CAN-2005-0605.patch
+Patch9334: xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch
 
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently).
 # Once a patch is determined to be safe to apply to other releases, it can
@@ -484,6 +484,7 @@
 Patch9500: xorg-x11-6.8.1-battle-libc-wrapper.patch
 Patch9501: xorg-x11-6.8.2-cursor-flicker.patch
 Patch9502: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
+Patch9503: xorg-x11-6.8.2-gcc4-fix.patch
 # end of build_fc4 only
 
 ######################################################################
@@ -493,9 +494,6 @@
 # Disable the ugly checkerboard pattern that X starts up with.  We're in the
 # year 2002 now, and this pattern just has to go.  No really.  <mharris>
 Patch10002: xorg-redhat-die-ugly-pattern-die-die-die.patch
-# Parallel make patch, designed specifically to hog all CPU's on all the
-# build system boxes and make kernel builds take longer.  <evil grin>
-Patch10003: XFree86-4.2.99.901-parallelmake.patch
 #XFree86-4.2.99.901-parallelmake-this-time-its-personal.patch
 Patch10005: XFree86-4.3.0-redhat-bug-report-address-update.patch
 
@@ -1111,25 +1109,22 @@
 %patch9319 -p0 -b .nls-indic-locales
 %patch9321 -p0 -b .ia64-hp-zx2-support-bug-119364
 %patch9323 -p0 -b .lnxLib-tmpl-sharedlibreq-fixes
-
 %patch9324 -p0 -b .composite-gravity.patch
-%if ! %{build_rhel4}
-%patch9325 -p0 -b .gcc4-fix.patch
-%endif
 %patch9326 -p0 -b .ati-radeon-disable-broken-renderaccel-by-default
 %patch9327 -p0 -b .ati-radeon-gcc4-fix
 %patch9328 -p0 -b .fix-font-crash.patch
 %patch9329 -p0 -b .xnest-shape-fix.patch
 %patch9330 -p0 -b .config-StaticNeedsPicForShared
 %patch9331 -p0 -b .XScreenSaverQueryInfo-crash-fix
-
 %patch9333 -p0 -b .xpm-security-fix-CAN-2005-0605
+%patch9334 -p0 -b .xorg.conf.man-dont-refer-to-nonexisting-example
 
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
 %if %{build_fc4}
 %patch9500 -p0 -b .battle-libc-wrapper
 %patch9501 -p0 -b .cursor-flicker.patch
 %patch9502 -p0 -b .use-linux-native-pciscan-by-default
+%patch9503 -p0 -b .gcc4-fix.patch
 %endif
 
 ########################################################################
@@ -1138,11 +1133,6 @@
 %patch10001 -p0 -b .redhat-custom-modelines
 # By default, we remove the default X server grey stipple pattern.
 %patch10002 -p0 -b .redhat-die-ugly-pattern-die-die-die
-# FIXME The parallel make patch might patch stuff that is fixed in a different
-# way now, but that doesn't conflict with the patch.  Disabled to be safe.
-%if %{parallel_build}
-#%patch10003 -p0 -b .parallelmake
-%endif
 # FIXME: This needs to be investigated for xorg-x11 packaging and fixed/updated
 #%patch10005 -p0 -b .redhat-bug-report-address-update
 
@@ -3565,6 +3555,12 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Tue Apr  5 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-21
+- Added xorg-x11-6.8.2-xorg.conf.man-dont-refer-to-nonexisting-example.patch
+  to fix bug (#69335)
+- Removed dead XFree86-4.2.99.901-parallelmake.patch as it has not worked for
+  several X releases and is unmaintained.
+
 * Tue Apr  5 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-20
 - Updated pre script to only strip away XkbRules lines indicating "xfree86"
   or "xorg" rules be used.  (#142429)


