From 259ff2095b158e7c0288af57d2ad87352dd1fc9f Mon Sep 17 00:00:00 2001 From: mharris Date: Thu, 22 Jun 2006 03:16:41 +0000 Subject: [PATCH] - Update to font-util-1.0.1 from X11R7.1 - Set package version to X11 release the tarballs are based from. --- ...0.1-autoconf-add-with-fontdir-option.patch | 26 +++++++++++++++++++ font-util-1.0.1-mapdir-use-datadir-fix.patch | 11 ++++++++ sources | 2 +- xorg-x11-font-utils.spec | 23 ++++++++++------ 4 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 font-util-1.0.1-autoconf-add-with-fontdir-option.patch create mode 100644 font-util-1.0.1-mapdir-use-datadir-fix.patch diff --git a/font-util-1.0.1-autoconf-add-with-fontdir-option.patch b/font-util-1.0.1-autoconf-add-with-fontdir-option.patch new file mode 100644 index 0000000..eb9fe8f --- /dev/null +++ b/font-util-1.0.1-autoconf-add-with-fontdir-option.patch @@ -0,0 +1,26 @@ +--- font-util-1.0.1/configure.ac.autoconf-add-with-fontdir-option 2005-12-16 00:16:32.000000000 -0500 ++++ font-util-1.0.1/configure.ac 2005-12-16 00:13:07.000000000 -0500 +@@ -40,6 +40,13 @@ + [MAPDIR="$DEFAULT_MAPDIR"]) + AC_SUBST(MAPDIR) + ++DEFAULT_FONTDIR=${datadir}/X11/fonts ++AC_ARG_WITH(fontdir, ++ AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install Xorg fonts by default]), ++ [FONTDIR="$withval"], ++ [FONTDIR="$DEFAULT_FONTDIR"]) ++AC_SUBST(FONTDIR) ++ + XORG_MANPAGE_SECTIONS + XORG_RELEASE_VERSION + +--- font-util-1.0.1/fontutil.pc.in.autoconf-add-with-fontdir-option 2005-12-16 00:17:06.000000000 -0500 ++++ font-util-1.0.1/fontutil.pc.in 2005-12-16 00:10:40.000000000 -0500 +@@ -2,6 +2,7 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + mapdir=@MAPDIR@ ++fontdir=@FONTDIR@ + + Name: FontUtil + Description: Font utilities dirs diff --git a/font-util-1.0.1-mapdir-use-datadir-fix.patch b/font-util-1.0.1-mapdir-use-datadir-fix.patch new file mode 100644 index 0000000..f3db9c5 --- /dev/null +++ b/font-util-1.0.1-mapdir-use-datadir-fix.patch @@ -0,0 +1,11 @@ +--- font-util-1.0.0/configure.ac.font-util-mapdir-use-datadir-fix 2005-12-14 19:24:26.000000000 -0500 ++++ font-util-1.0.1/configure.ac 2005-12-16 00:07:23.000000000 -0500 +@@ -33,7 +33,7 @@ + + m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +-DEFAULT_MAPDIR=${libdir}/X11/fonts/util ++DEFAULT_MAPDIR=${datadir}/X11/fonts/util + AC_ARG_WITH(mapdir, + AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]), + [MAPDIR="$withval"], diff --git a/sources b/sources index 33896ff..1e0f72c 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2 -0a537f95ee9d46f9e5b58c1a2c733dd4 font-util-1.0.0.tar.bz2 +b81535f78fe05732931f02841e5ca37b font-util-1.0.1.tar.bz2 efe452ec264ee0fddbe9300873164dec fonttosfnt-1.0.1.tar.bz2 94da9dcd2447300e8fdada896d7ed433 mkfontdir-1.0.2.tar.bz2 1e74e68eb9e8e91c6b7b615d80dc5ee1 mkfontscale-1.0.1.tar.bz2 diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec index 31f1ea5..2529434 100644 --- a/xorg-x11-font-utils.spec +++ b/xorg-x11-font-utils.spec @@ -13,20 +13,23 @@ Summary: X.Org X11 font utilities Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 -Version: 1.0.2 -Release: 2 +# NOTE: Keep version set to the X11Rx.y release the package is based upon. +Version: 7.1 +# Bump release for updates. +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/src/everything/bdftopcf-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.1.tar.bz2 Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/font-util-1.0.0.tar.bz2 -Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch -Patch1: font-util-1.0.0-autoconf-add-with-fontdir-option.patch +Source3: http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.1.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/individual/app/font-util-1.0.1.tar.bz2 + +Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch +Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch BuildRequires: pkgconfig # xorg-x11-libXfont-devel needed for bdftopcf @@ -151,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ucs2any.1x* %changelog +* Wed Jun 21 2006 Mike A. Harris 1:7.1-1 +- Update to font-util-1.0.1 from X11R7.1 +- Set package version to X11 release the tarballs are based from. + * Thu Apr 26 2006 Adam Jackson 1:1.0.2-2 - Update mkfontdir