* Mon Sep 14 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99.901-1

- xserver 1.6.99.901
- Re-enable Xdmx
- xserver-1.4.99-document-fontpath-correctly.patch: Drop
This commit is contained in:
Peter Hutterer 2009-09-15 00:46:01 +00:00
parent 7a95650c48
commit 1dc0563757
4 changed files with 9 additions and 64 deletions

View File

@ -1 +1 @@
xorg-server-1.6.99.900.tar.bz2
xorg-server-1.6.99.901.tar.bz2

View File

@ -1 +1 @@
e12b367b44e27def991f4542d85a9c63 xorg-server-1.6.99.900.tar.bz2
f30ecd48ae45f5bbe62fd17e81ee28c3 xorg-server-1.6.99.901.tar.bz2

View File

@ -18,8 +18,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.99.900
Release: 2%{?dist}
Version: 1.6.99.901
Release: 1%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -52,7 +52,6 @@ Patch5: xserver-1.4.99-pic-libxf86config.patch
Patch103: xserver-1.5.0-bg-none-root.patch
Patch104: dri2-page-flip.patch
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
Patch2014: xserver-1.5.0-projector-fb-size.patch
# Trivial things to never merge upstream ever:
@ -96,7 +95,6 @@ Patch6033: xserver-1.6.99-default-modes.patch
%endif
%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
# XXX dmx
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
BuildRequires: git-core
@ -203,7 +201,6 @@ but it is an X server itself in which you can run other software. It
is a very useful tool for developers who wish to test their
applications without running them on their real X server.
%if 0
%package Xdmx
Summary: Distributed Multihead X Server and utilities
Group: User Interface/X
@ -220,7 +217,6 @@ for Xdmx would be to provide multi-head support using two desktop machines,
each of which has a single display device attached to it. A complex
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
(each attached to one of 16 computers) into a unified 5120x4096 display.
%endif
%package Xvfb
Summary: A X Windows System virtual framebuffer X server.
@ -456,7 +452,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/Xnest
%{_mandir}/man1/Xnest.1*
%if 0
%files Xdmx
%defattr(-,root,root,-)
%{_bindir}/Xdmx
@ -475,7 +470,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dmxtodmx.1*
%{_mandir}/man1/vdltodmx.1*
%{_mandir}/man1/xdmxconfig.1*
%endif
%files Xvfb
%defattr(-,root,root,-)
@ -506,6 +500,11 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Mon Sep 14 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99.901-1
- xserver 1.6.99.901
- Re-enable Xdmx
- xserver-1.4.99-document-fontpath-correctly.patch: Drop
* Tue Sep 08 2009 Adam Jackson <ajax@redhat.com> 1.6.99.900-2
- Fix -source subtree to not include generated C files from hw/xfree86.
Actually, just remove all C files from hw/xfree86 in -source, since we

View File

@ -1,54 +0,0 @@
From 98c7481338e3167058382f27a3e002662553131a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@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