rpms/xorg-x11-server/F-11 xserver-1.6.1-document-fontpath-correctly.patch, NONE, 1.1 xorg-x11-server.spec, 1.442, 1.443 xserver-1.4.99-document-fontpath-correctly.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30820

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-document-fontpath-correctly.patch 
Removed Files:
	xserver-1.4.99-document-fontpath-correctly.patch 
Log Message:
* Mon May 04 2009 Adam Jackson <ajax at redhat.com> 1.6.1-11
- xserver-1.6.1-document-fontpath-correctly.patch: Typo fixes.


xserver-1.6.1-document-fontpath-correctly.patch:

--- NEW FILE xserver-1.6.1-document-fontpath-correctly.patch ---
>From 98c7481338e3167058382f27a3e002662553131a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 27 Nov 2007 16:09:43 -0500
Subject: [PATCH] Document default font path correctly.

---
 hw/xfree86/doc/man/xorg.conf.man.pre |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 3c657d0..4b562bd 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -356,11 +356,11 @@ font path elements (which can be set inside a catalogue directory):
 .PP
 .RS 4
 .nf
-.I __projectroot__/lib/X11/fonts/misc/
-.I __projectroot__/lib/X11/fonts/TTF/
-.I __projectroot__/lib/X11/fonts/Type1/
-.I __projectroot__/lib/X11/fonts/75dpi/
-.I __projectroot__/lib/X11/fonts/100dpi/
+.I __projectroot__/share/X11/fonts/misc/
+.I __projectroot__/share/X11/fonts/TTF/
+.I __projectroot__/share/X11/fonts/Type1/
+.I __projectroot__/share/X11/fonts/75dpi/
+.I __projectroot__/share/X11/fonts/100dpi/
 .fi
 .RE
 .PP
@@ -368,13 +368,13 @@ The recommended font path contains the following font path elements:
 .PP
 .RS 4
 .nf
-.I __projectroot__/lib/X11/fonts/local/
-.I __projectroot__/lib/X11/fonts/misc/
-.I __projectroot__/lib/X11/fonts/75dpi/:unscaled
-.I __projectroot__/lib/X11/fonts/100dpi/:unscaled
-.I __projectroot__/lib/X11/fonts/Type1/
-.I __projectroot__/lib/X11/fonts/75dpi/
-.I __projectroot__/lib/X11/fonts/100dpi/
+.I __projectroot__/share/X11/fonts/local/
+.I __projectroot__/share/X11/fonts/misc/
+.I __projectroot__/share/X11/fonts/75dpi/:unscaled
+.I __projectroot__/share/X11/fonts/100dpi/:unscaled
+.I __projectroot__/share/X11/fonts/Type1/
+.I __projectroot__/share/X11/fonts/75dpi/
+.I __projectroot__/share/X11/fonts/100dpi/
 .fi
 .RE
 .PP
-- 
1.5.3.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- xorg-x11-server.spec	4 May 2009 18:00:44 -0000	1.442
+++ xorg-x11-server.spec	4 May 2009 18:20:04 -0000	1.443
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -53,7 +53,7 @@ Patch103:  xserver-1.5.0-bg-none-root.pa
 # XXX move these to the end of the list
 Patch1003:  xserver-1.4.99-pic-libxf86config.patch
 
-Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
+Patch2013:  xserver-1.6.1-document-fontpath-correctly.patch
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
 # Trivial things to never merge upstream ever:
@@ -544,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 04 2009 Adam Jackson <ajax at redhat.com> 1.6.1-11
+- xserver-1.6.1-document-fontpath-correctly.patch: Typo fixes.
+
 * Mon May 04 2009 Adam Jackson <ajax at redhat.com> 1.6.1-10
 - xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other
   historical oddities.


--- xserver-1.4.99-document-fontpath-correctly.patch DELETED ---