From f6c32289ea52098c88c5be343badc862d775428b Mon Sep 17 00:00:00 2001 From: mharris Date: Nov 23 2005 05:22:21 +0000 Subject: - Changed package version to 0.99.1 to match the upstream font-util tarball version, and added "Epoch: 1" to the package for upgrades. - Added font-util-0.99.1-mapdir-use-datadir-fix.patch to fix the font-util mapfiles data to install into datadir instead of libdir (#173943) - Added "Requires(pre): libfontenc >= 0.99.2-2" to force a version of libfontenc to be installed that fixes bug #173453, and to also force it to be installed before xorg-x11-font-utils in a multi-package rpm transaction, which will ensure that when font packages get installed during upgrades via anaconda or yum, that the right libfontenc is being used by mkfontscale/mkfontdir. - Added ">= 0.99.2-2" to BuildRequires for libfontenc, as a convenience to people rebuilding xorg-x11-font-utils, as they'll need to install the new libfontenc now anyway before they can install the font-utils package. --- diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 97b55b9..bfc6d39 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -13,17 +13,21 @@ Summary: X.Org X11 font utilities Name: xorg-x11-%{pkgname} -Version: 6.99.99.902 -Release: 2 +# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! +Epoch: 1 +Version: 0.99.1 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bdftopcf-0.99.2.tar.bz2 Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fonttosfnt-0.99.2.tar.bz2 Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontdir-0.99.1.tar.bz2 Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontscale-0.99.1.tar.bz2 Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/font-util-0.99.1.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: font-util-0.99.1-mapdir-use-datadir-fix.patch BuildRequires: pkgconfig # xorg-x11-libXfont-devel needed for bdftopcf @@ -31,7 +35,7 @@ BuildRequires: libXfont-devel # xorg-x11-libX11-devel needed for fonttosfnt BuildRequires: libX11-devel # xorg-x11-libfontenc-devel needed for fonttosfnt, mkfontscale -BuildRequires: libfontenc-devel +BuildRequires: libfontenc-devel >= 0.99.2-2 # freetype-devel needed for bdftopcf, fonttosfnt, mkfontscale BuildRequires: freetype-devel # zlib-devel needed for bdftopcf @@ -43,6 +47,14 @@ BuildRequires: xorg-x11-proto-devel # FIXME: check if still needed for X11R7 Requires(pre): filesystem >= 2.3.6-1 +# NOTE: This versioned pre-dependency is needed to ensure that the bugfix for +# bug #173875 is installed in order for mkfontscale/mkfontdir to work +# properly. It is a "pre" dep, to ensure libfontenc gets installed before +# xorg-font-utils, before any fonts in an rpm upgrade or multi-transaction +# set, avoiding a possible race condition. +Requires(pre): libfontenc >= 0.99.2-2 + + Provides: %{pkgname} Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this @@ -64,86 +76,37 @@ and generation. %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 +%patch0 -p0 -b .font-util-mapdir-use-datadir-fix %build # Build all apps { for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do pushd $app-* + # FIXME: We run autoconf to activate font-util-0.99.1-mapdir-use-datadir-fix.patch + case $app in + font-util) + autoconf + ;; + esac %configure make popd done } -%if 0 -# Build fonttosfnt -{ - pushd fonttosfnt-* - %configure - make - popd -} -# Build mkfontdir -{ - pushd mkfontdir-* - %configure - make - popd -} -# Build mkfontscale -{ - pushd mkfontscale- - %configure - make - popd -} - -# Build font-util -{ - pushd font-util-%{upstreamversion} - %configure - make - popd -} -%endif %install rm -rf $RPM_BUILD_ROOT # Install all apps { - for app in bdftopcf fonttosfnt mkfontdir mkfontscale ; do + for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do pushd $app-* - %makeinstall + make install DESTDIR=$RPM_BUILD_ROOT popd done } %if 0 -# Install bdftopcf -{ - pushd bdftopcf-%{upstreamversion} - %makeinstall - popd -} -# Install fonttosfnt -{ - pushd fonttosfnt-%{upstreamversion} - %makeinstall - popd -} -# Install mkfontdir -{ - pushd mkfontdir-%{upstreamversion} - %makeinstall - popd -} -# Install mkfontscale -{ - pushd mkfontscale-%{upstreamversion} - %makeinstall - popd -} -%endif # Install font-util { pushd font-util-%{upstreamversion} @@ -151,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT popd } +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -165,11 +129,11 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mkfontdir %{_bindir}/mkfontscale %{_bindir}/ucs2any -%dir %{_libdir} -%dir %{_libdir}/X11 -%dir %{_libdir}/X11/fonts -%dir %{_libdir}/X11/fonts/util -%{_libdir}/X11/fonts/util/map-* +%dir %{_datadir} +%dir %{_datadir}/X11 +%dir %{_datadir}/X11/fonts +%dir %{_datadir}/X11/fonts/util +%{_datadir}/X11/fonts/util/map-* %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/fontutil.pc %dir %{_mandir} @@ -182,6 +146,21 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1x/ucs2any.1x* %changelog +* Tue Nov 22 2005 Mike A. Harris 1:0.99.1-1 +- Changed package version to 0.99.1 to match the upstream font-util tarball + version, and added "Epoch: 1" to the package for upgrades. +- Added font-util-0.99.1-mapdir-use-datadir-fix.patch to fix the font-util + mapfiles data to install into datadir instead of libdir (#173943) +- Added "Requires(pre): libfontenc >= 0.99.2-2" to force a version of + libfontenc to be installed that fixes bug #173453, and to also force it + to be installed before xorg-x11-font-utils in a multi-package rpm + transaction, which will ensure that when font packages get installed + during upgrades via anaconda or yum, that the right libfontenc is being + used by mkfontscale/mkfontdir. +- Added ">= 0.99.2-2" to BuildRequires for libfontenc, as a convenience to + people rebuilding xorg-x11-font-utils, as they'll need to install the new + libfontenc now anyway before they can install the font-utils package. + * Mon Nov 14 2005 Jeremy Katz 6.99.99.902-2 - require newer filesystem (#172610)