From 5034bde51c2b3cc2c513e01af8db8423dbf32069 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 8 Jun 2010 01:45:56 +0000 Subject: [PATCH] - Require xorg-x11-font-utils >= 7.2-11 for font-utils 1.1.0 - Fix bashism in spec file (&>) - Remove perl hack for DEFAULT_FONTS_DIR, fixed upstream - Remove perl and autoconf requirement. - Create %ghost files {misc|705dpi|...}/fonts.scale. - Drop fontdir alias patches - Update a few fonts (well, all of them) - encodings-1.0.3 - font-adobe-100dpi-1.0.1 - font-adobe-75dpi-1.0.1 - font-adobe-utopia-100dpi-1.0.2 - font-adobe-utopia-75dpi-1.0.2 - font-adobe-utopia-type1-1.0.2 - font-alias-1.0.2 - font-arabic-misc-1.0.1 - font-bh-100dpi-1.0.1 - font-bh-75dpi-1.0.1 - font-bh-lucidatypewriter-100dpi-1.0.1 - font-bh-lucidatypewriter-75dpi-1.0.1 - font-bitstream-100dpi-1.0.1 - font-bitstream-75dpi-1.0.1 - font-bitstream-type1-1.0.1 - font-cronyx-cyrillic-1.0.1 - font-cursor-misc-1.0.1 - font-daewoo-misc-1.0.1 - font-dec-misc-1.0.1 - font-isas-misc-1.0.1 - font-jis-misc-1.0.1 - font-micro-misc-1.0.1 - font-misc-cyrillic-1.0.1 - font-misc-ethiopic-1.0.1 - font-misc-misc-1.1.0 - font-mutt-misc-1.0.1 - font-schumacher-misc-1.1.0 - font-screen-cyrillic-1.0.2 - font-sony-misc-1.0.1 - font-sun-misc-1.0.1 - font-winitzki-cyrillic-1.0.1 - font-xfree86-type1-1.0.2 --- .cvsignore | 32 ++++++++++ sources | 64 +++++++++---------- xorg-x11-fonts.spec | 146 +++++++++++++++++++++++++------------------- 3 files changed, 148 insertions(+), 94 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8ab848c..dc91506 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,35 @@ *.tar.bz2 *.tar.gz clog +encodings-1.0.3.tar.bz2 +font-adobe-100dpi-1.0.1.tar.bz2 +font-adobe-75dpi-1.0.1.tar.bz2 +font-adobe-utopia-100dpi-1.0.2.tar.bz2 +font-adobe-utopia-75dpi-1.0.2.tar.bz2 +font-adobe-utopia-type1-1.0.2.tar.bz2 +font-alias-1.0.2.tar.bz2 +font-arabic-misc-1.0.1.tar.bz2 +font-bh-100dpi-1.0.1.tar.bz2 +font-bh-75dpi-1.0.1.tar.bz2 +font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 +font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 +font-bitstream-100dpi-1.0.1.tar.bz2 +font-bitstream-75dpi-1.0.1.tar.bz2 +font-bitstream-type1-1.0.1.tar.bz2 +font-cronyx-cyrillic-1.0.1.tar.bz2 +font-cursor-misc-1.0.1.tar.bz2 +font-daewoo-misc-1.0.1.tar.bz2 +font-dec-misc-1.0.1.tar.bz2 +font-isas-misc-1.0.1.tar.bz2 +font-jis-misc-1.0.1.tar.bz2 +font-micro-misc-1.0.1.tar.bz2 +font-misc-cyrillic-1.0.1.tar.bz2 +font-misc-ethiopic-1.0.1.tar.bz2 +font-misc-misc-1.1.0.tar.bz2 +font-mutt-misc-1.0.1.tar.bz2 +font-schumacher-misc-1.1.0.tar.bz2 +font-screen-cyrillic-1.0.2.tar.bz2 +font-sony-misc-1.0.1.tar.bz2 +font-sun-misc-1.0.1.tar.bz2 +font-winitzki-cyrillic-1.0.1.tar.bz2 +font-xfree86-type1-1.0.2.tar.bz2 diff --git a/sources b/sources index 7bd9c70..8e0adcd 100644 --- a/sources +++ b/sources @@ -1,36 +1,36 @@ -c6d3fe9d5359349ceeab657f236c04d5 encodings-1.0.0.tar.bz2 -443acfe70e26716282f9068730fe92c4 font-adobe-100dpi-1.0.0.tar.bz2 -813b5d3723c84388a938ab6732e1329c font-adobe-75dpi-1.0.0.tar.bz2 -5d28a30efef966f8dbbaff9a6619f01a font-adobe-utopia-100dpi-1.0.1.tar.bz2 -dd912284e4750023f9682812532fa033 font-adobe-utopia-75dpi-1.0.1.tar.bz2 -aa7ff4bd20b961afda9c15d103b972a5 font-adobe-utopia-type1-1.0.1.tar.bz2 -c4776b6f0f2ecdb7670b6fe64b5d2a2d font-alias-1.0.1.tar.bz2 -81595016e2ff859716fc256ebb136ba6 font-arabic-misc-1.0.0.tar.bz2 -e5592de74a5c04e3a2608800dd079197 font-bh-100dpi-1.0.0.tar.bz2 -6e51cd02f4ce32e1393e34ab17a9b211 font-bh-75dpi-1.0.0.tar.bz2 -c44d3f730564da465993e9292a33c235 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 -fdd9be5b9db94ef363a33e39b7977e2b font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 +29637480e7ce12546668631067c19ced encodings-1.0.3.tar.bz2 +c754c3f4a5e08442bf6972b9466625ed font-adobe-100dpi-1.0.1.tar.bz2 +a47681c97bd012196691c95e34d400f1 font-adobe-75dpi-1.0.1.tar.bz2 +1c3a2c26bd3f6e406fbadc7380efa369 font-adobe-utopia-100dpi-1.0.2.tar.bz2 +71dffebeeb702d10876555c361fb69cf font-adobe-utopia-75dpi-1.0.2.tar.bz2 +ad945b19b2db64dec3a19507848ff63b font-adobe-utopia-type1-1.0.2.tar.bz2 +9d40dba6fb8cb58dacb433fc7bcaafca font-alias-1.0.2.tar.bz2 +817ceb99636c873ad7679fe2a468678d font-arabic-misc-1.0.1.tar.bz2 +8af580b87e17ddacdf0ce3d775248387 font-bh-100dpi-1.0.1.tar.bz2 +53785d2688392aec5cba79fc0ddb23a2 font-bh-75dpi-1.0.1.tar.bz2 +a2b3951dbc6ddb2e4c7e09519dd13333 font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 +6397062f2b346ce5bbe5472f3353a9a9 font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 ad43cf739b3d46ba1e7dc778a0608a52 font-bh-ttf-1.0.0.tar.bz2 46588b22678e440741d6220bc3945cbf font-bh-type1-1.0.0.tar.bz2 -173352ddec3d26e2b91df1edcf1ae85b font-bitstream-100dpi-1.0.0.tar.bz2 -beb476657d50d07d17eef7c325a5ed08 font-bitstream-75dpi-1.0.0.tar.bz2 -6610475e2e231242f8f2122a709c3695 font-bitstream-type1-1.0.0.tar.bz2 -22b451e7230b8c003cfc496ee2d360cc font-cronyx-cyrillic-1.0.0.tar.bz2 -305fa22cdfefb8f80babd711051a534b font-cursor-misc-1.0.0.tar.bz2 -61f9eab48c619af5494d3e384d8d7d79 font-daewoo-misc-1.0.0.tar.bz2 -284e554db1c64fb7580a06df01444a2b font-dec-misc-1.0.0.tar.bz2 +3b8748f8029c53595e4a4a1b23fa790a font-bitstream-100dpi-1.0.1.tar.bz2 +aed54fb53d2d24aff10c92985286d1e5 font-bitstream-75dpi-1.0.1.tar.bz2 +a4e8e229a051c0ede9eb525e4006d93a font-bitstream-type1-1.0.1.tar.bz2 +15f86f5e572df21218617982eb4b3bfc font-cronyx-cyrillic-1.0.1.tar.bz2 +13c21c4d74155c662152a1a74f249d96 font-cursor-misc-1.0.1.tar.bz2 +05597e2b193a7b7de2ca525468276b1d font-daewoo-misc-1.0.1.tar.bz2 +05714516824c680ce747c6ef9d2fbbdd font-dec-misc-1.0.1.tar.bz2 8e8733051371e2b51123376b49f5d3ea font-ibm-type1-1.0.0.tar.bz2 -ec709a96b64b497a5cb5658c93bd38dc font-isas-misc-1.0.0.tar.bz2 -61febb49a71065723a1fba17cbf23c67 font-jis-misc-1.0.0.tar.bz2 -8c8bffd7540f05caa0dbb4e6e1d6c58e font-micro-misc-1.0.0.tar.bz2 -3596907d7a2a99c81d8de99bc4552b6a font-misc-cyrillic-1.0.0.tar.bz2 -0b271fc617087d77560bdca20c0cdbb0 font-misc-ethiopic-1.0.0.tar.bz2 +88b5b32c5a27576e9d00675bcc966806 font-isas-misc-1.0.1.tar.bz2 +5835c99d056f4a29d7d6a5ae873cf00e font-jis-misc-1.0.1.tar.bz2 +6350117efebe340f33e818f4a33e4e4b font-micro-misc-1.0.1.tar.bz2 +c79d7921d95b2c4f10fad464bb121090 font-misc-cyrillic-1.0.1.tar.bz2 +4c88c79b8e5d47af90b21e948d42755f font-misc-ethiopic-1.0.1.tar.bz2 ccb212a7badf7aefdc9f9a92af428d32 font-misc-meltho-1.0.0.tar.bz2 -2a57f6188c41d4bc1b88ca3d08ad011d font-misc-misc-1.0.0.tar.bz2 -648b409b7eb78ad1cd5f6d7fac3eef88 font-mutt-misc-1.0.0.tar.bz2 -f1c6063d2fadc57e696a0aab69afd6e0 font-schumacher-misc-1.0.0.tar.bz2 -aea02d9dff03e0e1a3de85364367c0c6 font-screen-cyrillic-1.0.0.tar.bz2 -0dfddd1a946e4497f009094c0ae1bdd5 font-sony-misc-1.0.0.tar.bz2 -e17d43a7c6c0d862cfba0908ff132ffa font-sun-misc-1.0.0.tar.bz2 -b99b02aff36a88ca3379715423c60303 font-winitzki-cyrillic-1.0.0.tar.bz2 -e66f36a6d68203cc4cf7b56ebbb192dd font-xfree86-type1-1.0.0.tar.bz2 +878bfd4e9f14c1279cea3a8392e0dbdd font-misc-misc-1.1.0.tar.bz2 +aab7ac62b960e77aa11d032bafe1d460 font-mutt-misc-1.0.1.tar.bz2 +86f4b7d8b11a2e6da70884c59b5866a3 font-schumacher-misc-1.1.0.tar.bz2 +c912a976b66073acd80c9d5c624f3aae font-screen-cyrillic-1.0.2.tar.bz2 +7b6f5117814599b86ed3470de6c62aa3 font-sony-misc-1.0.1.tar.bz2 +5a185c5549a650bf062d343e128682ca font-sun-misc-1.0.1.tar.bz2 +92bf4ecb373faac545cef2dcbe40be35 font-winitzki-cyrillic-1.0.1.tar.bz2 +a966f5a8aade9e63af86d8a6bf3e8586 font-xfree86-type1-1.0.2.tar.bz2 diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 504c059..8d0a180 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -26,65 +26,57 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 7.2 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT and Lucida and Public Domain Group: User Interface/X URL: http://www.x.org BuildArch: noarch -Source0: ftp://ftp.x.org/pub/individual/font/encodings-1.0.0.tar.bz2 -Source1: ftp://ftp.x.org/pub/individual/font/font-alias-1.0.1.tar.bz2 -Source10: ftp://ftp.x.org/pub/individual/font/font-adobe-100dpi-1.0.0.tar.bz2 -Source11: ftp://ftp.x.org/pub/individual/font/font-adobe-75dpi-1.0.0.tar.bz2 -Source12: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2 -Source13: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2 -Source14: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.1.tar.bz2 -Source15: ftp://ftp.x.org/pub/individual/font/font-arabic-misc-1.0.0.tar.bz2 -Source16: ftp://ftp.x.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2 -Source17: ftp://ftp.x.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2 -Source18: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 -Source19: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/font/encodings-1.0.3.tar.bz2 +Source1: ftp://ftp.x.org/pub/individual/font/font-alias-1.0.2.tar.bz2 +Source10: ftp://ftp.x.org/pub/individual/font/font-adobe-100dpi-1.0.1.tar.bz2 +Source11: ftp://ftp.x.org/pub/individual/font/font-adobe-75dpi-1.0.1.tar.bz2 +Source12: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.2.tar.bz2 +Source13: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2 +Source14: ftp://ftp.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.2.tar.bz2 +Source15: ftp://ftp.x.org/pub/individual/font/font-arabic-misc-1.0.1.tar.bz2 +Source16: ftp://ftp.x.org/pub/individual/font/font-bh-100dpi-1.0.1.tar.bz2 +Source17: ftp://ftp.x.org/pub/individual/font/font-bh-75dpi-1.0.1.tar.bz2 +Source18: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 +Source19: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 # Luxi fonts are under a bad license. # See: https://bugzilla.redhat.com/show_bug.cgi?id=317641 # Source20: ftp://ftp.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2 # 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 -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 -Source28: ftp://ftp.x.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2 -Source29: ftp://ftp.x.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2 +Source22: ftp://ftp.x.org/pub/individual/font/font-bitstream-100dpi-1.0.1.tar.bz2 +Source23: ftp://ftp.x.org/pub/individual/font/font-bitstream-75dpi-1.0.1.tar.bz2 +Source25: ftp://ftp.x.org/pub/individual/font/font-bitstream-type1-1.0.1.tar.bz2 +Source26: ftp://ftp.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.1.tar.bz2 +Source27: ftp://ftp.x.org/pub/individual/font/font-cursor-misc-1.0.1.tar.bz2 +Source28: ftp://ftp.x.org/pub/individual/font/font-daewoo-misc-1.0.1.tar.bz2 +Source29: ftp://ftp.x.org/pub/individual/font/font-dec-misc-1.0.1.tar.bz2 # Source30: ftp://ftp.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2 -Source31: ftp://ftp.x.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2 -Source32: ftp://ftp.x.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2 -Source33: ftp://ftp.x.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2 -Source34: ftp://ftp.x.org/pub/individual/font/font-misc-cyrillic-1.0.0.tar.bz2 +Source31: ftp://ftp.x.org/pub/individual/font/font-isas-misc-1.0.1.tar.bz2 +Source32: ftp://ftp.x.org/pub/individual/font/font-jis-misc-1.0.1.tar.bz2 +Source33: ftp://ftp.x.org/pub/individual/font/font-micro-misc-1.0.1.tar.bz2 +Source34: ftp://ftp.x.org/pub/individual/font/font-misc-cyrillic-1.0.1.tar.bz2 %if %{with_ethiopic_fonts} -Source35: ftp://ftp.x.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2 +Source35: ftp://ftp.x.org/pub/individual/font/font-misc-ethiopic-1.0.1.tar.bz2 %endif # Source36: ftp://ftp.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2 -Source37: ftp://ftp.x.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2 -Source38: ftp://ftp.x.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2 -Source39: ftp://ftp.x.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2 -Source40: ftp://ftp.x.org/pub/individual/font/font-screen-cyrillic-1.0.0.tar.bz2 -Source41: ftp://ftp.x.org/pub/individual/font/font-sony-misc-1.0.0.tar.bz2 -Source42: ftp://ftp.x.org/pub/individual/font/font-sun-misc-1.0.0.tar.bz2 -Source43: ftp://ftp.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.0.tar.bz2 -Source44: ftp://ftp.x.org/pub/individual/font/font-xfree86-type1-1.0.0.tar.bz2 - -Patch0: font-alias-1.0.0-fonts-alias-fontdir-fix.patch -Patch1: encodings-1.0.0-encodings-fontdir-fix.patch - -# FIXME: Temporary requirement on autoconf for a workaround. -BuildRequires: autoconf +Source37: ftp://ftp.x.org/pub/individual/font/font-misc-misc-1.1.0.tar.bz2 +Source38: ftp://ftp.x.org/pub/individual/font/font-mutt-misc-1.0.1.tar.bz2 +Source39: ftp://ftp.x.org/pub/individual/font/font-schumacher-misc-1.1.0.tar.bz2 +Source40: ftp://ftp.x.org/pub/individual/font/font-screen-cyrillic-1.0.2.tar.bz2 +Source41: ftp://ftp.x.org/pub/individual/font/font-sony-misc-1.0.1.tar.bz2 +Source42: ftp://ftp.x.org/pub/individual/font/font-sun-misc-1.0.1.tar.bz2 +Source43: ftp://ftp.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.1.tar.bz2 +Source44: ftp://ftp.x.org/pub/individual/font/font-xfree86-type1-1.0.2.tar.bz2 BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros -# The font-utils dep here is to ensure we have a fontutil.pc file which -# defines the 'fontdir' variable. -BuildRequires: font-utils >= 1.0.2-1 +BuildRequires: xorg-x11-font-utils >= 7.2-11 # FIXME: fontconfig is needed only because the upstream Makefiles invoke # fc-cache at build time. This is totally useless, because we do not ship # any of the resulting cache files, we generate them at install time from the @@ -93,8 +85,6 @@ BuildRequires: font-utils >= 1.0.2-1 BuildRequires: fontconfig BuildRequires: ucs2any, bdftruncate, bdftopcf -# FIXME: perl is used for now to avoid having to maintain a big patch. -BuildRequires: perl Conflicts: xorg-x11-server-Xorg < 1.3.0.0-10 Conflicts: xorg-x11-server-Xnest < 1.3.0.0-10 @@ -323,28 +313,19 @@ Contains a set of Cyrillic fonts. %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 #-------------------------------------------------------------------------- %build pushd encodings-* -%configure +%configure --with-fontrootdir=%{_x11fontdir} make popd for dir in font-*; do pushd $dir - # FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of - # making a patch that patches 35 or so configure.ac files and maintaining - # it for an indefinite amount of time. Hopefully my solution here will - # get considered to be included in upstream 7.1 release in which case I'll - # turn it into a series of diffs instead and submit it. For now tho, perl - # is my friend. -- mharris - perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac - autoconf - %configure \ + # FIXME: do any fonts actually support the ISO8559 configure flags? + %configure --with-fontrootdir=%{_x11fontdir} \ --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-6 \ --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 \ --disable-iso8859-13 --disable-iso8859-16 @@ -357,9 +338,6 @@ done rm -rf $RPM_BUILD_ROOT for dir in *; do - # FIXME: The upstream sources need to be patched to allow direct - # specification of the 'fontdir' variable, instead of it being - # relative to libdir. make -C $dir install DESTDIR=$RPM_BUILD_ROOT done @@ -377,11 +355,11 @@ done { ENCODINGSDIR=$RPM_BUILD_ROOT%{_datadir}/X11/fonts/encodings [ -d "${ENCODINGSDIR}" ] || mkdir -p "${ENCODINGSDIR}" - pushd "${ENCODINGSDIR}" &> /dev/null + pushd "${ENCODINGSDIR}" mkfontscale -n -e "${ENCODINGSDIR}" -e "${ENCODINGSDIR}/large" sed -i "s@$RPM_BUILD_ROOT@@" encodings.dir sed -i "s@$RPM_BUILD_ROOT@@" large/encodings.dir - popd &> /dev/null + popd } @@ -394,11 +372,13 @@ done touch $FONTDIR/$subdir/fonts.{alias,scale} chmod 0644 $FONTDIR/$subdir/fonts.{alias,scale} done - # Create fake %ghost encodings.dir, fonts.dir, fonts.cache-* + # Create fake %ghost encodings.dir, fonts.dir, fonts.scale, fonts.cache-* for subdir in Type1 TTF OTF 100dpi 75dpi cyrillic misc ; do rm -f $FONTDIR/$subdir/{encodings,fonts}.dir touch $FONTDIR/$subdir/{encodings,fonts}.dir chmod 0644 $FONTDIR/$subdir/{encodings,fonts}.dir + touch $FONTDIR/$subdir/fonts.scale + chmod 0644 $FONTDIR/$subdir/fonts.scale # Create bogus fonts.cache-* files # Create somewhat future-proofed ghosted fonts.cache-* files so that @@ -634,6 +614,7 @@ rm -rf $RPM_BUILD_ROOT %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 %attr(644,root,root) %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-* @@ -1110,6 +1091,47 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Tue Jun 08 2010 Peter Hutterer 7.2-11 +- Require xorg-x11-font-utils >= 7.2-11 for font-utils 1.1.0 +- Fix bashism in spec file (&>) +- Remove perl hack for DEFAULT_FONTS_DIR, fixed upstream +- Remove perl and autoconf requirement. +- Create %ghost files {misc|705dpi|...}/fonts.scale. +- Drop fontdir alias patches +- Update a few fonts (well, all of them) + - encodings-1.0.3 + - font-adobe-100dpi-1.0.1 + - font-adobe-75dpi-1.0.1 + - font-adobe-utopia-100dpi-1.0.2 + - font-adobe-utopia-75dpi-1.0.2 + - font-adobe-utopia-type1-1.0.2 + - font-alias-1.0.2 + - font-arabic-misc-1.0.1 + - font-bh-100dpi-1.0.1 + - font-bh-75dpi-1.0.1 + - font-bh-lucidatypewriter-100dpi-1.0.1 + - font-bh-lucidatypewriter-75dpi-1.0.1 + - font-bitstream-100dpi-1.0.1 + - font-bitstream-75dpi-1.0.1 + - font-bitstream-type1-1.0.1 + - font-cronyx-cyrillic-1.0.1 + - font-cursor-misc-1.0.1 + - font-daewoo-misc-1.0.1 + - font-dec-misc-1.0.1 + - font-isas-misc-1.0.1 + - font-jis-misc-1.0.1 + - font-micro-misc-1.0.1 + - font-misc-cyrillic-1.0.1 + - font-misc-ethiopic-1.0.1 + - font-misc-misc-1.1.0 + - font-mutt-misc-1.0.1 + - font-schumacher-misc-1.1.0 + - font-screen-cyrillic-1.0.2 + - font-sony-misc-1.0.1 + - font-sun-misc-1.0.1 + - font-winitzki-cyrillic-1.0.1 + - font-xfree86-type1-1.0.2 + * Fri Mar 05 2010 Matěj Cepl - 7.2-10 - Fixed bad directory ownership of /etc//X11/fontpath.d