rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.18,1.19
Kristian Høgsberg (krh)
fedora-extras-commits at redhat.com
Fri Jun 22 22:10:38 UTC 2007
Author: krh
Update of /cvs/pkgs/rpms/xorg-x11-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24577
Modified Files:
xorg-x11-fonts.spec
Log Message:
* Fri Jun 22 2007 Kristian Høgsberg <krh at redhat.com> - 7.1-4
- Use the new catalogue font install mechanism, drop all chkfontpath dependencies.
- Unsplit base and misc subpackages, we don't require any base fonts
now that we have built-ins.
Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-fonts.spec 8 Dec 2006 18:44:33 -0000 1.18
+++ xorg-x11-fonts.spec 22 Jun 2007 22:10:03 -0000 1.19
@@ -2,6 +2,8 @@
# for debuginfo.
%define debug_package %{nil}
+%define _catalogue /etc/X11/fontpath.d
+
# FIXME: The _sysfontdir stuff doesn't work yet, so don't use it. Once
# upstream fonts have a build time configureable output directory that is
# a sane mechanism, we can rethink this.
@@ -30,7 +32,7 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: Various licenses
Group: User Interface/X
URL: http://www.x.org
@@ -54,9 +56,6 @@
Source21: ftp://ftp.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
Source22: ftp://ftp.x.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2
Source23: ftp://ftp.x.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2
-# NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font
-# support by default, so we exclude the speedo fonts.
-#Source24: font-bitstream-speedo-1.0.0.tar.bz2
Source25: ftp://ftp.x.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2
Source26: ftp://ftp.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.0.tar.bz2
Source27: ftp://ftp.x.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2
@@ -99,63 +98,29 @@
BuildRequires: fontconfig
BuildRequires: ucs2any, bdftruncate, bdftopcf
-# FIXME: perl is used for now to avoid having to maintain a big patch.
-BuildRequires: perl
+# FIXME: sed is used for now to avoid having to maintain a big patch.
+BuildRequires: sed
+
+Conflicts: xorg-x11-server-Xorg < 1.3.0.0-10
+Conflicts: xorg-x11-server-Xnext < 1.3.0.0-10
+Conflicts: xorg-x11-server-Xdmx < 1.3.0.0-10
+Conflicts: xorg-x11-server-Xvfb < 1.3.0.0-10
+Conflicts: xorg-x11-server-Xephyr < 1.3.0.0-10
+Conflicts: xorg-x11-xfs < 1.0.4-1
%description
X.Org X Window System fonts
-#--------------------------------------------------------------------------
-%package base
-Summary: Base fonts required by the X Window System.
-Group: User Interface/X
-Requires(post): mkfontdir, mkfontscale, fontconfig, chkfontpath
-Requires(postun): mkfontdir, mkfontscale, fontconfig, chkfontpath
-# Required so upgrades work, since base fonts moved here from main pkg
-Conflicts: XFree86 <= 4.2.0-3.1
-# The fonts.* files from truetype and syriac moved from those pkgs to base
-Conflicts: XFree86-truetype-fonts < 4.2.99.901-20030209.2
-Conflicts: XFree86-syriac-fonts < 4.2.99.901-20030209.2
-# NOTE: Modular X packaging has split the FC3/FC4/RHEL4 fonts-xorg-base
-# package into 2 subpackages, 'base' containing the fixed/cursor fonts that
-# are required for proper X server operation, and 'misc' containing the
-# various Asian/Indic/Arabic/etc. fonts that were previously in 'base'. This
-# Obsoletes is also present in the 'misc' subpackage, however Jeremy Katz
-# indicated that it is ok to put this in multiple subpackages, and OS upgrades
-# will "do the right thing". Ditto for XFree86-base-fonts/xorg-x11-base-fonts.
-# NOTE: "Obsoletes: XFree86-base-fonts" required for upgrades from RHEL2.1,
-# RHEL 3, RHL 7.x,8,9, FC1
-Obsoletes: XFree86-base-fonts
-# NOTE: "Obsoletes: xorg-x11-base-fonts" required for upgrades from FC2, stock FC3
-Obsoletes: xorg-x11-base-fonts
-# NOTE: "Obsoletes: fonts-xorg-base" required for upgrades from FC3, FC4, RHEL4
-Obsoletes: fonts-xorg-base
-
-%description base
-This package provides the base fonts, and font encoding files that are
-required by the X Window System.
-#--------------------------------------------------------------------------
%package misc
Summary: misc bitmap fonts for the X Window System
Group: User Interface/X
-Requires(post): mkfontdir, fontconfig, chkfontpath
-Requires(postun): mkfontdir, fontconfig
-# Required so upgrades work, since base fonts moved here from main pkg
-Conflicts: XFree86 <= 4.2.0-3.1
-# NOTE: Modular X packaging has split the FC3/FC4/RHEL4 fonts-xorg-base
-# package into 2 subpackages, 'base' containing the fixed/cursor fonts that
-# are required for proper X server operation, and 'misc' containing the
-# various Asian/Indic/Arabic/etc. fonts that were previously in 'base'. This
-# Obsoletes is also present in the 'base' subpackage, however Jeremy Katz
-# indicated that it is ok to put this in multiple subpackages, and OS upgrades
-# will "do the right thing". Ditto for XFree86-base-fonts/xorg-x11-base-fonts.
-# NOTE: "Obsoletes: XFree86-base-fonts" required for upgrades from RHEL2.1,
-# RHEL 3, RHL 7.x,8,9, FC1
+Requires(post): mkfontdir
+Requires(postun): mkfontdir
Obsoletes: XFree86-base-fonts
-# NOTE: "Obsoletes: xorg-x11-base-fonts" required for upgrades from FC2, stock FC3
Obsoletes: xorg-x11-base-fonts
-# NOTE: "Obsoletes: fonts-xorg-base" required for upgrades from FC3, FC4, RHEL4
Obsoletes: fonts-xorg-base
+Obsoletes: xorg-x11-fonts-base
+Provides: xorg-x11-fonts-base
%description misc
This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
@@ -164,22 +129,10 @@
%package Type1
Summary: Type1 fonts provided by the X Window System
Group: User Interface/X
-Requires(post): mkfontdir, fontconfig, mkfontscale, chkfontpath
-Requires(postun): mkfontdir, fontconfig, mkfontscale
-# NOTE: Modular X packaging has split the FC3/FC4/RHEL4 fonts-xorg-base
-# package into 2 subpackages, 'base' containing the fixed/cursor fonts that
-# are required for proper X server operation, and 'misc' containing the
-# various Asian/Indic/Arabic/etc. fonts that were previously in 'base'. This
-# Obsoletes is also present in the 'base' and 'misc' subpackage, however
-# Jeremy Katz indicated that it is ok to put this in multiple subpackages,
-# and OS upgrades will "do the right thing". Ditto for
-# XFree86-base-fonts/xorg-x11-base-fonts.
-# NOTE: "Obsoletes: XFree86-base-fonts" required for upgrades from RHEL2.1,
-# RHEL 3, RHL 7.x,8,9, FC1
+Requires(post): mkfontdir, fontconfig, ttmkfdir
+Requires(postun): mkfontdir, fontconfig, ttmkfdir
Obsoletes: XFree86-base-fonts
-# NOTE: "Obsoletes: xorg-x11-base-fonts" required for upgrades from FC2, stock FC3
Obsoletes: xorg-x11-base-fonts
-# NOTE: "Obsoletes: fonts-xorg-base" required for upgrades from FC3, FC4, RHEL4
Obsoletes: fonts-xorg-base
%description Type1
@@ -189,7 +142,7 @@
%package truetype
Summary: TrueType fonts provided by the X Window System
Group: User Interface/X
-Requires(post): mkfontdir, fontconfig, ttmkfdir, chkfontpath
+Requires(post): mkfontdir, fontconfig, ttmkfdir
Requires(postun): mkfontdir, fontconfig, ttmkfdir
Obsoletes: XFree86-truetype-fonts
Obsoletes: xorg-x11-truetype-fonts
@@ -202,7 +155,7 @@
%package syriac
Summary: Syriac TrueType fonts by Beth Mardutho
Group: User Interface/X
-Requires(post): mkfontdir, mkfontscale, fontconfig, chkfontpath
+Requires(post): mkfontdir, mkfontscale, fontconfig
Requires(postun): mkfontdir, mkfontscale, fontconfig
Obsoletes: XFree86-syriac-fonts
Obsoletes: xorg-x11-syriac-fonts
@@ -216,7 +169,7 @@
%package ethiopic
Summary: Ethiopic fonts
Group: User Interface/X
-Requires(post): mkfontdir, ttmkfdir, mkfontscale, fontconfig, chkfontpath
+Requires(post): mkfontdir, ttmkfdir, mkfontscale, fontconfig
Requires(postun): mkfontdir, ttmkfdir, mkfontscale, fontconfig
%description ethiopic
@@ -226,7 +179,7 @@
%package 75dpi
Summary: A set of 75dpi resolution fonts for the X Window System.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-75dpi-fonts
Obsoletes: xorg-x11-75dpi-fonts
@@ -238,7 +191,7 @@
%package 100dpi
Summary: A set of 100dpi resolution fonts for the X Window System.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-100dpi-fonts
Obsoletes: xorg-x11-100dpi-fonts
@@ -250,7 +203,7 @@
%package ISO8859-1-75dpi
Summary: A set of 75dpi ISO-8859-1 fonts for X.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-75dpi-fonts
Obsoletes: xorg-x11-75dpi-fonts
@@ -264,7 +217,7 @@
%package ISO8859-1-100dpi
Summary: A set of 100dpi ISO-8859-1 fonts for X.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-100dpi-fonts
Obsoletes: xorg-x11-100dpi-fonts
@@ -278,7 +231,7 @@
%package ISO8859-2-75dpi
Summary: A set of 75dpi Central European language fonts for X.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-2-75dpi-fonts
Obsoletes: xorg-x11-ISO8859-2-75dpi-fonts
@@ -290,7 +243,7 @@
%package ISO8859-2-100dpi
Summary: A set of 100dpi Central European language fonts for X.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-2-100dpi-fonts
Obsoletes: xorg-x11-ISO8859-2-100dpi-fonts
@@ -302,7 +255,7 @@
%package ISO8859-9-75dpi
Summary: ISO8859-9-75dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-9-75dpi-fonts
Obsoletes: xorg-x11-ISO8859-9-75dpi-fonts
@@ -314,7 +267,7 @@
%package ISO8859-9-100dpi
Summary: ISO8859-9-100dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-9-100dpi-fonts
Obsoletes: xorg-x11-ISO8859-9-100dpi-fonts
@@ -326,7 +279,7 @@
%package ISO8859-14-75dpi
Summary: ISO8859-14-75dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-14-75dpi-fonts
Obsoletes: xorg-x11-ISO8859-14-75dpi-fonts
@@ -339,7 +292,7 @@
%package ISO8859-14-100dpi
Summary: ISO8859-14-100dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-14-100dpi-fonts
Obsoletes: xorg-x11-ISO8859-14-100dpi-fonts
@@ -352,7 +305,7 @@
%package ISO8859-15-75dpi
Summary: ISO8859-15-75dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-15-75dpi-fonts
Obsoletes: xorg-x11-ISO8859-15-75dpi-fonts
@@ -365,7 +318,7 @@
%package ISO8859-15-100dpi
Summary: ISO8859-15-100dpi fonts
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-ISO8859-15-100dpi-fonts
Obsoletes: xorg-x11-ISO8859-15-100dpi-fonts
@@ -378,7 +331,7 @@
%package cyrillic
Summary: Cyrillic fonts for X.
Group: User Interface/X
-Requires(post): mkfontdir, chkfontpath
+Requires(post): mkfontdir
Requires(postun): mkfontdir
Obsoletes: XFree86-cyrillic-fonts
Obsoletes: xorg-x11-cyrillic-fonts
@@ -395,14 +348,12 @@
%define setup_fonts_type1 -a14 -a21 -a25 -a30 -a44
%define setup_fonts_ttf -a20
%define setup_fonts_otf %{ethiopic_fonts} -a36
-# NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font
-# support by default, so we exclude the speedo fonts.
-%define setup_fonts_speedo -a24
-%define setup_font_metadata -a1
%define setup_fonts_bitmap %{setup_fonts_misc} %{setup_fonts_100dpi} %{setup_fonts_75dpi} %{setup_fonts_cyrillic}
%define setup_fonts_scaleable %{setup_fonts_type1} %{setup_fonts_ttf} %{setup_fonts_otf}
+%define setup_font_metadata -a1
+
%setup -q -c %{name}-%{version} %{setup_font_metadata} %{setup_fonts_bitmap} %{setup_fonts_scaleable}
%patch0 -p0 -b .fonts-alias-fontdir-fix
%patch1 -p0 -b .encodings-fontdir-fix
@@ -414,8 +365,6 @@
pushd $dir
case $dir in
encodings-*)
- perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
- autoconf
%configure
;;
@@ -452,6 +401,25 @@
popd
done
+# Install catalogue symlinks
+mkdir -p $RPM_BUILD_ROOT%{_catalogue}
+for f in misc:unscaled Type1 TTF OTF 75dpi:unscaled 100dpi:unscaled cyrillic; do
+ ln -fs %{_x11fontdir}/${f%:unscaled} $RPM_BUILD_ROOT%{_catalogue}/xorg-x11-fonts-$f
+done
+
+# Generate the encodings.dir files in the encodings directories during
+# install time to work around bugs in upstream Makefiles. This is more
+# consistent with how we generate fonts.dir files anyway. Fixes bugs:
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875
+# https://bugs.freedesktop.org/show_bug.cgi?id=6028
+{
+ ENCODINGSDIR=$RPM_BUILD_ROOT%{_datadir}/X11/fonts/encodings
+ pushd "${ENCODINGSDIR}" &> /dev/null
+ mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large"
+ popd &> /dev/null
+}
+
+
# Create fake %ghost files for file manifests.
{
# Make ghost fonts.alias, fonts.dir, encodings.dir files
@@ -499,83 +467,12 @@
# duplication in these font installation scripts, then add the generic
# font installation script to xorg-x11-font-utils or whatever.
-%post base
-{
- FONTDIR=%{_x11fontdir}/misc
- ENCODINGSDIR=%{_datadir}/X11/fonts/encodings
- XFSCONFIG=/etc/X11/fs/config
-
- #-------------------------------------------------------------------
- # Upgrade section - during upgrades only
- if [ "$1" -gt "1" ] ; then
- # Remove the Speedo directory from xfs config as X.Org no longer provides
- # Speedo font support.
- /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo
-
- # NOTE: Remove the non :unscaled version of misc font directory from
- # configuration to undo a temporary workaround that was added in 0.99.0-5
- # XFS config file upgrade munging
- if [ -f $XFSCONFIG ] ; then
- # FIXME: chkfontpath is broken, and removes both misc and misc:unscaled
- # /usr/sbin/chkfontpath -qr %{_x11fontdir}/misc
-
- # On upgrades, remove 'misc' without :unscaled from the XFS config
- # file to avoid ugly scaled bitmap fonts. chkfontpath can't be used
- # as it is buggy and will remove the :unscaled entry also.
- if grep -q "%{_x11fontdir}/misc," $XFSCONFIG &> /dev/null ; then
- for fpe in misc ; do
- sed -ie "\#^.*%{_x11fontdir}/${fpe},.*#d" $XFSCONFIG
- done
- fi
- fi
- fi
-
- #-------------------------------------------------------------------
- # Both installs and upgrades
-
- # Generate the encodings.dir files in the encodings directories during
- # install time to work around bugs in upstream Makefiles. This is more
- # consistent with how we generate fonts.dir files anyway. Fixes bugs:
- # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875
- # https://bugs.freedesktop.org/show_bug.cgi?id=6028
- {
- pushd "${ENCODINGSDIR}" &> /dev/null
- mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large"
- popd &> /dev/null
- }
-
- mkfontdir $FONTDIR
- # NOTE: We add the ":unscaled" suffix to avoid ugly bitmap fonts.
- /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled
- fc-cache $FONTDIR
-}
-# || :
-# &> /dev/null || :
-
-%postun base
-{
- # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
- if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
- mkfontdir %{_x11fontdir}/misc
- # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
- fc-cache %{_x11fontdir}/misc
- fi
-}
-# &> /dev/null || :
-
%post misc
{
FONTDIR=%{_x11fontdir}/misc
mkfontdir $FONTDIR
- # NOTE: We add the ":unscaled" suffix to avoid ugly bitmap fonts.
- /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled
- # FIXME: This should only be done on upgrades.
- # Remove the Speedo directory from xfs config as X.Org no longer provides
- # Speedo font support.
- /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo
fc-cache $FONTDIR
}
-# &> /dev/null || :
%postun misc
{
@@ -586,17 +483,14 @@
fc-cache %{_x11fontdir}/misc
fi
}
-# &> /dev/null || :
%post Type1
{
FONTDIR=%{_type1_fontdir}/Type1
mkfontscale $FONTDIR
mkfontdir $FONTDIR
- /usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
}
-#&> /dev/null || :
%postun Type1
{
@@ -607,17 +501,14 @@
fc-cache $FONTDIR
fi
}
-# &> /dev/null || :
%post truetype
{
FONTDIR=%{_ttf_fontdir}/TTF
ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
mkfontdir $FONTDIR
- /usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
}
-# &> /dev/null || :
%postun truetype
{
@@ -628,17 +519,14 @@
fc-cache $FONTDIR
fi
}
-# &> /dev/null || :
%post syriac
{
FONTDIR=%{_otf_fontdir}/OTF
mkfontscale $FONTDIR
mkfontdir $FONTDIR
- /usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
}
-# &> /dev/null || :
%postun syriac
{
@@ -649,7 +537,6 @@
fc-cache $FONTDIR
fi
}
-# &> /dev/null || :
%if %{with_ethiopic_fonts}
%post ethiopic
@@ -657,16 +544,13 @@
FONTDIR=%{_ttf_fontdir}/TTF
ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
mkfontdir $FONTDIR
- /usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
FONTDIR=%{_otf_fontdir}/OTF
mkfontscale $FONTDIR
mkfontdir $FONTDIR
- /usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
}
-# &> /dev/null || :
%postun ethiopic
{
@@ -683,99 +567,46 @@
fc-cache $FONTDIR
fi
}
-# &> /dev/null || :
%endif
%post 75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post 100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post ISO8859-1-75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post ISO8859-1-100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post ISO8859-2-75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post ISO8859-2-100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post ISO8859-9-75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post ISO8859-9-100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post ISO8859-14-75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post ISO8859-14-100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post ISO8859-15-75dpi
-{
- mkfontdir %{_x11fontdir}/75dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/75dpi
%post ISO8859-15-100dpi
-{
- mkfontdir %{_x11fontdir}/100dpi
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/100dpi
%post cyrillic
-{
- mkfontdir %{_x11fontdir}/cyrillic
- /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled
-}
-# &> /dev/null || :
+mkfontdir %{_x11fontdir}/cyrillic
%postun 75dpi
{
@@ -783,7 +614,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun 100dpi
{
@@ -791,7 +621,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-1-75dpi
{
@@ -799,7 +628,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-1-100dpi
{
@@ -807,7 +635,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-2-75dpi
{
@@ -815,7 +642,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-2-100dpi
{
@@ -823,7 +649,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-9-75dpi
{
@@ -831,7 +656,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-9-100dpi
{
@@ -839,7 +663,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-14-75dpi
{
@@ -847,7 +670,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-14-100dpi
{
@@ -855,7 +677,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-15-75dpi
{
@@ -863,7 +684,6 @@
mkfontdir %{_x11fontdir}/75dpi
fi
}
-# &> /dev/null || :
%postun ISO8859-15-100dpi
{
@@ -871,7 +691,6 @@
mkfontdir %{_x11fontdir}/100dpi
fi
}
-# &> /dev/null || :
%postun cyrillic
{
@@ -879,7 +698,6 @@
mkfontdir %{_x11fontdir}/cyrillic
fi
}
-# &> /dev/null || :
#--------------------------------------------------------------------------
%check
@@ -888,61 +706,14 @@
%clean
rm -rf $RPM_BUILD_ROOT
#--------------------------------------------------------------------------
-%files base
+%files misc
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-misc:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/misc
-# font-cursor-misc ('cursor' font required by X server)
-%{_x11fontdir}/misc/cursor.pcf*
-# font-dec-misc (DEC cursors)
-%{_x11fontdir}/misc/dec????.pcf*
-# font-misc-misc ('fixed' font required by X server)
-%{_x11fontdir}/misc/[1-9]*-ISO8859-*.pcf*
-%{_x11fontdir}/misc/10x20-KOI8-R.pcf*
-%{_x11fontdir}/misc/10x20.pcf*
-%{_x11fontdir}/misc/12x13ja.pcf*
-%{_x11fontdir}/misc/18x18ja.pcf*
-%{_x11fontdir}/misc/18x18ko.pcf*
-%{_x11fontdir}/misc/4x6-KOI8-R.pcf*
-%{_x11fontdir}/misc/4x6.pcf*
-%{_x11fontdir}/misc/5x7-KOI8-R.pcf*
-%{_x11fontdir}/misc/5x7.pcf*
-%{_x11fontdir}/misc/5x8-KOI8-R.pcf*
-%{_x11fontdir}/misc/5x8.pcf*
-%{_x11fontdir}/misc/6x10-KOI8-R.pcf*
-%{_x11fontdir}/misc/6x10.pcf*
-%{_x11fontdir}/misc/6x12-KOI8-R.pcf*
-%{_x11fontdir}/misc/6x12.pcf*
-%{_x11fontdir}/misc/6x13-KOI8-R.pcf*
-%{_x11fontdir}/misc/6x13.pcf*
-%{_x11fontdir}/misc/6x13B.pcf*
-%{_x11fontdir}/misc/6x13O.pcf*
-%{_x11fontdir}/misc/6x9-KOI8-R.pcf*
-%{_x11fontdir}/misc/6x9.pcf*
-%{_x11fontdir}/misc/7x13-KOI8-R.pcf*
-%{_x11fontdir}/misc/7x13.pcf*
-%{_x11fontdir}/misc/7x13B.pcf*
-%{_x11fontdir}/misc/7x13O.pcf*
-%{_x11fontdir}/misc/7x14-JISX0201.1976-0.pcf*
-%{_x11fontdir}/misc/7x14-KOI8-R.pcf*
-%{_x11fontdir}/misc/7x14.pcf*
-%{_x11fontdir}/misc/7x14B.pcf*
-%{_x11fontdir}/misc/8x13-KOI8-R.pcf*
-%{_x11fontdir}/misc/8x13.pcf*
-%{_x11fontdir}/misc/8x13B.pcf*
-%{_x11fontdir}/misc/8x13O.pcf*
-%{_x11fontdir}/misc/9x15-KOI8-R.pcf*
-%{_x11fontdir}/misc/9x15.pcf*
-%{_x11fontdir}/misc/9x15B.pcf*
-%{_x11fontdir}/misc/9x18-KOI8-R.pcf*
-%{_x11fontdir}/misc/9x18.pcf*
-%{_x11fontdir}/misc/9x18B.pcf*
-%{_x11fontdir}/misc/k14.pcf*
-%{_x11fontdir}/misc/nil2.pcf*
-# font-schumacher-misc
-%{_x11fontdir}/misc/cl[BIR][456789]x*.pcf*
-# encodings
+%{_x11fontdir}/misc/*
%dir %{_datadir}/X11/fonts/encodings
%dir %{_datadir}/X11/fonts/encodings/large
%{_datadir}/X11/fonts/encodings/*.enc.gz
@@ -956,47 +727,10 @@
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
-%files misc
-%defattr(-,root,root,-)
-%doc
-%dir %{_x11fontdir}
-%dir %{_x11fontdir}/misc
-# font-arabic-misc (Arabic)
-%{_x11fontdir}/misc/arabic24.pcf*
-# font-daewoo-misc (Korean)
-%{_x11fontdir}/misc/hangl*.pcf*
-# font-isas-misc (Chinese)
-%{_x11fontdir}/misc/gb[12][46][fs][st].pcf*
-# font-jis-misc (Japanese)
-%{_x11fontdir}/misc/jiskan??.pcf*
-# font-mutt-misc
-%{_x11fontdir}/misc/cu-alt12.pcf*
-%{_x11fontdir}/misc/cu-arabic12.pcf*
-%{_x11fontdir}/misc/cu-devnag12.pcf*
-%{_x11fontdir}/misc/cu-lig12.pcf*
-%{_x11fontdir}/misc/cu-pua12.pcf*
-%{_x11fontdir}/misc/cu12.pcf*
-%{_x11fontdir}/misc/cuarabic12.pcf*
-%{_x11fontdir}/misc/cudevnag12.pcf*
-# font-micro-misc
-%{_x11fontdir}/misc/micro.pcf*
-# font-sony-misc (Japanese and ISO-8859-1)
-%{_x11fontdir}/misc/12x24.pcf*
-%{_x11fontdir}/misc/12x24rk.pcf*
-%{_x11fontdir}/misc/8x16.pcf*
-%{_x11fontdir}/misc/8x16rk.pcf*
-# font-sun-misc (OpenLook glyphs)
-%{_x11fontdir}/misc/olcursor.pcf*
-%{_x11fontdir}/misc/olgl1?.pcf*
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.dir
-# NOTE: Xorg supplies this fonts.alias, so it is not ghosted
-%verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
-
%files truetype
%defattr(-,root,root)
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-TTF
%dir %{_x11fontdir}
%dir %{_x11fontdir}/TTF
# font-bh-ttf
@@ -1010,6 +744,8 @@
%files syriac
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-OTF
%dir %{_x11fontdir}
%dir %{_x11fontdir}/OTF
# font-misc-meltho
@@ -1048,6 +784,9 @@
%files ethiopic
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-TTF
+%{_catalogue}/xorg-x11-fonts-OTF
%dir %{_x11fontdir}
# TTF fonts
%dir %{_x11fontdir}/TTF
@@ -1071,6 +810,8 @@
%files 75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1112,6 +853,8 @@
%files 100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1153,6 +896,8 @@
%files ISO8859-1-75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1186,6 +931,8 @@
%files ISO8859-1-100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1219,6 +966,8 @@
%files ISO8859-2-75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1252,6 +1001,8 @@
%files ISO8859-2-100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1285,6 +1036,8 @@
%files ISO8859-9-75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1318,6 +1071,8 @@
%files ISO8859-9-100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1351,6 +1106,8 @@
%files ISO8859-14-75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1384,6 +1141,8 @@
%files ISO8859-14-100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1417,6 +1176,8 @@
%files ISO8859-15-75dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-75dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/75dpi
# font-adobe-75dpi
@@ -1450,6 +1211,8 @@
%files ISO8859-15-100dpi
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-100dpi:unscaled
%dir %{_x11fontdir}
%dir %{_x11fontdir}/100dpi
# font-adobe-100dpi
@@ -1483,6 +1246,8 @@
%files Type1
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-Type1
%dir %{_x11fontdir}
%dir %{_x11fontdir}/Type1
# font-adobe-utopia-type1
@@ -1506,6 +1271,8 @@
%files cyrillic
%defattr(-,root,root,-)
%doc
+%dir %{_catalogue}
+%{_catalogue}/xorg-x11-fonts-cyrillic
%dir %{_x11fontdir}
%dir %{_x11fontdir}/cyrillic
# font-cronyx-cyrillic
@@ -1532,6 +1299,11 @@
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
%changelog
+* Fri Jun 22 2007 Kristian Høgsberg <krh at redhat.com> - 7.1-4
+- Use the new catalogue font install mechanism, drop all chkfontpath dependencies.
+- Unsplit base and misc subpackages, we don't require any base fonts
+ now that we have built-ins.
+
* Fri Dec 8 2006 Adam Jackson <ajax at redhat.com> 7.1-3
- Create encodings.dir containing entries for both
%{_datadir}/X11/fonts/encodings and
More information about the fedora-extras-commits
mailing list