From 7c1da3119a67add776f684b6e8b9aec659847d78 Mon Sep 17 00:00:00 2001 From: mharris Date: Nov 06 2005 14:23:11 +0000 Subject: auto-import xorg-x11-font-utils-6.99.99.901-2 on branch devel from xorg-x11-font-utils-6.99.99.901-2.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 63d4214..de51797 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ bdftopcf-0.99.1.tar.bz2 fonttosfnt-0.99.1.tar.bz2 mkfontdir-0.99.1.tar.bz2 mkfontscale-0.99.1.tar.bz2 +font-util-0.99.1.tar.bz2 diff --git a/sources b/sources index c734d66..d1b447c 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ d5bdf1b76bcdfd8ac0a7a35a43a9a55d bdftopcf-0.99.1.tar.bz2 4b2227ff198324bba114e2b54b0f33e3 fonttosfnt-0.99.1.tar.bz2 3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2 841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2 +006214458f6f419b12bcd7590c5e4b66 font-util-0.99.1.tar.bz2 diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 23d5069..7cca4a0 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -14,14 +14,15 @@ Summary: X.Org X11 font utilities Name: xorg-x11-%{pkgname} Version: 6.99.99.901 -Release: 1 +Release: 2 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/bdftopcf-%{upstreamversion}.tar.bz2 -Source1: http://xorg.freedesktop.org/X11R7.0-RC0/everything/fonttosfnt-%{upstreamversion}.tar.bz2 -Source2: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontdir-%{upstreamversion}.tar.bz2 -Source3: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontscale-%{upstreamversion}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bdftopcf-%{upstreamversion}.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fonttosfnt-%{upstreamversion}.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontdir-%{upstreamversion}.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontscale-%{upstreamversion}.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/font-util-%{upstreamversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # xorg-x11-libXfont-devel needed for bdftopcf @@ -39,7 +40,7 @@ BuildRequires: zlib-devel BuildRequires: xorg-x11-proto-devel Provides: %{pkgname} -Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale +Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this # is needed for upgrades to work properly from OS releases that had XFree86 Obsoletes: XFree86-font-utils @@ -50,17 +51,15 @@ Conflicts: XFree86 # NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to # xorg-x11-font-utils in 6.7.99.903-3 Conflicts: xorg-x11-base-fonts <= 6.7.99.903-3 -# FIXME: modular X seems to be abscent of ucs2any so far, so I'll update this -# when I find it later... -- mharris # NOTE: ucs2any moved from xorg-x11-tools to xorg-x11-font-utils in 6.7.99.903-3 -#Conflicts: xorg-x11-tools <= 6.7.99.903-3 +Conflicts: xorg-x11-tools <= 6.7.99.903-3 %description X.Org X11 font utilities required for font installation, conversion, and generation. %prep -%setup -q -c %{name}-%{version} -a1 -a2 -a3 +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 %build # Build bdftopcf @@ -92,32 +91,47 @@ and generation. popd } +# Build font-util +{ + pushd font-util-%{upstreamversion} + %configure + make + popd +} + %install rm -rf $RPM_BUILD_ROOT -# Build bdftopcf +# Install bdftopcf { pushd bdftopcf-%{upstreamversion} %makeinstall popd } -# Build fonttosfnt +# Install fonttosfnt { pushd fonttosfnt-%{upstreamversion} %makeinstall popd } -# Build mkfontdir +# Install mkfontdir { pushd mkfontdir-%{upstreamversion} %makeinstall popd } -# Build mkfontscale +# Install mkfontscale { pushd mkfontscale-%{upstreamversion} %makeinstall popd } +# Install font-util +{ + pushd font-util-%{upstreamversion} +# %%makeinstall + make install DESTDIR=$RPM_BUILD_ROOT + popd +} %clean rm -rf $RPM_BUILD_ROOT @@ -127,15 +141,43 @@ rm -rf $RPM_BUILD_ROOT %doc %dir %{_bindir} %{_bindir}/bdftopcf +%{_bindir}/bdftruncate %{_bindir}/fonttosfnt %{_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-ISO8859-1 +%{_libdir}/X11/fonts/util/map-ISO8859-10 +%{_libdir}/X11/fonts/util/map-ISO8859-11 +%{_libdir}/X11/fonts/util/map-ISO8859-13 +%{_libdir}/X11/fonts/util/map-ISO8859-14 +%{_libdir}/X11/fonts/util/map-ISO8859-15 +%{_libdir}/X11/fonts/util/map-ISO8859-16 +%{_libdir}/X11/fonts/util/map-ISO8859-2 +%{_libdir}/X11/fonts/util/map-ISO8859-3 +%{_libdir}/X11/fonts/util/map-ISO8859-4 +%{_libdir}/X11/fonts/util/map-ISO8859-5 +%{_libdir}/X11/fonts/util/map-ISO8859-6 +%{_libdir}/X11/fonts/util/map-ISO8859-7 +%{_libdir}/X11/fonts/util/map-ISO8859-8 +%{_libdir}/X11/fonts/util/map-ISO8859-9 +%{_libdir}/X11/fonts/util/map-JISX0201.1976-0 +%{_libdir}/X11/fonts/util/map-KOI8-R +%dir %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/fontutil.pc %dir %{_mandir} %dir %{_mandir}/man1x %{_mandir}/man1x/bdftopcf.1x* +%{_mandir}/man1x/bdftruncate.1x* +%{_mandir}/man1x/fonttosfnt.1x* %{_mandir}/man1x/mkfontdir.1x* %{_mandir}/man1x/mkfontscale.1x* -%{_mandir}/man1x/fonttosfnt.1x* +%{_mandir}/man1x/ucs2any.1x* + #%{_x11bindir}/bdftruncate #%{_x11mandir}/man1x/bdftruncate.1x* @@ -148,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT #%{_x11mandir}/man1/ucs2any.1* %changelog +* Sun Nov 6 2005 Mike A. Harris 6.99.99.901-2 +- Added font-util-0.99.1 to package, from X11R7 RC1 release, which provides + ucs2any, bdftruncate. + * Wed Oct 26 2005 Mike A. Harris 6.99.99.901-1 - Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from X11R7 RC1.