rpms/xorg-x11-xfs/devel xfs.config, NONE, 1.1 xorg-x11-xfs.spec, 1.28, 1.29 xfs.config.in, 1.2, NONE
Kristian Høgsberg (krh)
fedora-extras-commits at redhat.com
Fri Jun 22 21:44:22 UTC 2007
Author: krh
Update of /cvs/pkgs/rpms/xorg-x11-xfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15195
Modified Files:
xorg-x11-xfs.spec
Added Files:
xfs.config
Removed Files:
xfs.config.in
Log Message:
* Fri Jun 22 2007 Kristian Høgsberg <krh at hinata.boston.redhat.com> - 1:1.0.4-1
- Require catalogue capable libXfont.
- Drop xfs.config.in, just use catalogue font path.
- Stop xorg.conf munging madness.
--- NEW FILE xfs.config ---
#
# xfs font server configuration file
#
# allow a max of 10 clients to connect to this font server
client-limit = 10
# when a font server reaches its limit, start up a new one
clone-self = on
# alternate font servers for clients to use
#alternate-servers = foo:7101,bar:7102
# where to look for fonts
catalogue = catalogue:/etc/X11/fontpath.d
# in 12 points, decipoints
default-point-size = 120
# 75 x 75 and 100 x 100
default-resolutions = 75,75,100,100
# use lazy loading on 16 bit fonts
deferglyphs = 16
# Log errors via syslog.
use-syslog = on
# For security, don't listen to TCP ports by default.
no-listen = tcp
Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-xfs.spec 22 Apr 2007 01:40:53 -0000 1.28
+++ xorg-x11-xfs.spec 22 Jun 2007 21:43:46 -0000 1.29
@@ -1,15 +1,7 @@
-%define pkgname xfs
-
-%define _x11fontdir %(pkg-config --variable=fontdir fontutil)
-%define _sysfontdir %{_datadir}/fonts
-%define _oldx11fontdir /usr/X11R6/lib/X11/fonts
-
-%define xfs_version 1.0.2
-
Summary: X.Org X11 xfs font server
-Name: xorg-x11-%{pkgname}
-Version: %{xfs_version}
-Release: 4
+Name: xorg-x11-xfs
+Version: 1.0.4
+Release: 1
# NOTE: Remove Epoch line if package gets renamed
Epoch: 1
License: MIT/X11
@@ -23,8 +15,7 @@
Source3: ftp://ftp.x.org/pub/individual/app/fstobdf-1.0.2.tar.bz2
Source4: ftp://ftp.x.org/pub/individual/app/showfont-1.0.1.tar.bz2
Source10: xfs.init
-# NOTE: xfs config input file, processed via sed below.
-Source11: xfs.config.in
+Source11: xfs.config
BuildRequires: pkgconfig
# xfs needs 'fontsproto' to build, as indicated by ./configure
@@ -32,21 +23,14 @@
# FIXME: xfs needs xtrans to build, but autotools doesn't detect it missing
BuildRequires: xorg-x11-xtrans-devel
BuildRequires: libFS-devel
-# FIXME: The version specification can be removed from here in the future,
-# as it is not really mandatory, but forces a bugfix workaround on people who
-# are using pre-rawhide modular X.
-BuildRequires: libXfont-devel >= 0.99.2-3
+BuildRequires: libXfont-devel
BuildRequires: libX11-devel
# FIXME: xfs needs freetype-devel to build, but autotools doesn't detect it missing
BuildRequires: freetype-devel
-# font-utils >= 1.0.0 needed for fontdir pkgconfig variable
-BuildRequires: font-utils >= 1.0.0-1
BuildRequires: libfontenc-devel
-# FIXME: This Requires on libXfont can be removed from here in the future,
-# as it is not really mandatory, but forces a bugfix workaround on people who
-# are using pre-rawhide modular X.
-Requires: libXfont >= 0.99.2-3
+# Make sure libXfont provides the catalogue FPE.
+Requires: libXfont >= 1.2.9
Provides: xfs
@@ -58,7 +42,7 @@
# xfs initscript runtime dependencies
Requires: initscripts, fontconfig, sed, /usr/bin/find
-Requires: /usr/sbin/chkfontpath, /bin/sort, /usr/bin/uniq
+Requires: /bin/sort, /usr/bin/uniq
Requires: mkfontdir, mkfontscale, ttmkfdir
Requires: /sbin/restorecon
# end of xfs initscript runtime dependencies
@@ -94,7 +78,7 @@
# Build xfs
{
- pushd %{pkgname}-*
+ pushd xfs-*
%configure
# FIXME: Create patch for the following, and submit it upstream.
# <daniels> mharris: uhm, just set configdir=$(sysconfdir) in Makefile.am
@@ -116,7 +100,7 @@
rm -rf $RPM_BUILD_ROOT
# Install xfs
{
- pushd %{pkgname}-*
+ pushd xfs-*
# FIXME: Create patch for the following, and submit it upstream.
# <daniels> mharris: uhm, just set configdir=$(sysconfdir) in Makefile.am
# <mharris> daniels: Do you mean, change it in Makefile.am, and submit patch to fix? Or patch it for local use?
@@ -135,9 +119,7 @@
{
mkdir -p $RPM_BUILD_ROOT/etc/{X11/fs,rc.d/init.d}
install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xfs
-# install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
- sed -e 's#@XFONTDIR@#%{_x11fontdir}#g;s#@SYSFONTDIR@#%{_sysfontdir}#g' < %{SOURCE11} > $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
- chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
+ install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
}
%clean
@@ -191,24 +173,6 @@
XORG_CONFIG=/etc/X11/xorg.conf
XFSCONFIG=/etc/X11/fs/config
- if [ -f $XORG_CONFIG ] ; then
- # If the X server is configured to use UNIX socket for font server
- if grep -q 'unix/:' $XORG_CONFIG &> /dev/null ; then
- # Disable legacy font path element in X server config
- if grep -q '/usr/X11R6/lib/X11/fonts/TrueType' $XORG_CONFIG &> /dev/null ; then
- perl -p -i -e 's|FontPath[ ]*"/usr/X11R6/lib/X11/fonts/TrueType"|#FontPath "/usr/X11R6/lib/X11/fonts/TrueType"|g' $XORG_CONFIG
- fi
-
- # Convert config to use modern unix socket
- perl -p -i -e 's#unix/:-1#unix/:7100#g' $XORG_CONFIG
-
- # Disable TCP listen by default for xfs
- if [ -f $XFSCONFIG ] && ! grep -q "no-listen" $XFSCONFIG &> /dev/null ; then
- echo -e "# For security, don't listen to TCP ports by default.\nno-listen = tcp\n" >> $XFSCONFIG
- fi
- fi
- fi
-
# XFS config file upgrade munging
if [ -f $XFSCONFIG ] ; then
# Remove Speedo font directories from xfs config if present to avoid
@@ -266,7 +230,7 @@
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/fs/config
#%dir %{_mandir}/man1x
# FIXME: The manpage incorrectly points to /usr/X11R6/...
-%{_mandir}/man1/xfs.1x*
+%{_mandir}/man1/xfs.1*
%{_sysconfdir}/rc.d/init.d/xfs
%files utils
@@ -281,6 +245,11 @@
%{_mandir}/man1/xfsinfo.1x*
%changelog
+* Fri Jun 22 2007 Kristian Høgsberg <krh at hinata.boston.redhat.com> - 1:1.0.4-1
+- Require catalogue capable libXfont.
+- Drop xfs.config.in, just use catalogue font path.
+- Stop xorg.conf munging madness.
+
* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1:1.0.2-4
- Don't install INSTALL
--- xfs.config.in DELETED ---
More information about the fedora-extras-commits
mailing list