rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-21

Browse Source 
- xserver-1.3.0-document-fontpath-correctly.patch: Fix man page to point to
  directories that exist. (#251203, Matěj Cepl)
This commit is contained in:
Adam Jackson 2007-08-23 19:36:14 +00:00
parent bb8ddfe263
commit 926d57d41d
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-server.spec
View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.3.0.0
Release: 20%{?dist}
Release: 21%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@ -70,6 +70,7 @@ Patch2009: xserver-1.3.0-arm-iopl.patch
Patch2010: xserver-1.3.0-idletime.patch
Patch2011: xserver-1.3.0-edid-quirk-backports.patch
Patch2012: xserver-1.3.0-add-really-slow-bcopy.patch
Patch2013: xserver-1.3.0-document-fontpath-correctly.patch
# assorted PCI layer shenanigans. oh the pain.
Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch
@ -329,6 +330,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch2010 -p1 -b .idletime
%patch2011 -p1 -b .edid-quirks
%patch2012 -p1 -b .slow-bcopy
%patch2013 -p1 -b .fontpath-doc
%patch2500 -p1 -b .unbreak-domains
%patch2501 -p1 -b .pci-bus-count
@ -604,6 +606,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-21
- xserver-1.3.0-document-fontpath-correctly.patch: Fix man page to point to
directories that exist. (#251203, Matěj Cepl)
* Wed Aug 15 2007 Dave Airlie <airlied@redhat.com> 1.3.0.0-20
- xserver-1.3.0-newglx-offscreen-pixmaps.patch: fix zero-copy TFP again

43
xserver-1.3.0-document-fontpath-correctly.patch Normal file
View File

@ -0,0 +1,43 @@
diff -up xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre.jx xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre
--- xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre.jx 2006-12-22 03:06:49.000000000 -0500
+++ xorg-server-1.3.0.0/hw/xfree86/doc/man/xorg.conf.man.pre 2007-08-23 15:27:47.000000000 -0400
@@ -308,11 +308,11 @@ font path elements:
.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
@@ -320,14 +320,14 @@ The recommended font path contains the f
.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/Speedo/
-.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/Speedo/
+.I __projectroot__/share/X11/fonts/75dpi/
+.I __projectroot__/share/X11/fonts/100dpi/
.fi
.RE
.PP