[xorg-x11-font-utils] - font-util 1.2.0 - mkfontscale 1.0.8 - bdftopcf 1.0.3

[Peter Hutterer]

commit 2b4c65172ac118dfb67827e30a6df12386a20ffc
Author: Peter Hutterer <peter.hutterer(a)who-t.net&gt;
Date:   Mon Nov 1 15:17:15 2010 +1000

    - font-util 1.2.0
    - mkfontscale 1.0.8
    - bdftopcf 1.0.3

 .gitignore                              |    9 +++++++++
 mkfontscale-examine-all-encodings.patch |    4 ++--
 sources                                 |    6 +++---
 xorg-x11-font-utils.spec                |   18 +++++++++++++-----
 4 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12e44ac..31600e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,12 @@ bdftopcf-1.0.1.tar.bz2
 mkfontscale-1.0.7.tar.bz2
 mkfontdir-1.0.5.tar.bz2
 font-util-1.1.2.tar.bz2
+/bdftopcf-1.0.1.tar.bz2
+/bdftopcf-1.0.3.tar.bz2
+/fonttosfnt-1.0.3.tar.bz2
+/font-util-1.1.0.tar.bz2
+/font-util-1.1.2.tar.bz2
+/font-util-1.2.0.tar.bz2
+/mkfontdir-1.0.5.tar.bz2
+/mkfontscale-1.0.7.tar.bz2
+/mkfontscale-1.0.8.tar.bz2
diff --git a/mkfontscale-examine-all-encodings.patch
b/mkfontscale-examine-all-encodings.patch
index ee790b0..2004746 100644
--- a/mkfontscale-examine-all-encodings.patch
+++ b/mkfontscale-examine-all-encodings.patch
@@ -1,6 +1,6 @@
 diff -up xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c.all-encodings
xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c
---- xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c.all-encodings	2009-01-22
16:09:20.000000000 +0100
-+++ xorg-x11-font-utils-7.2/mkfontscale-1.0.7/mkfontscale.c	2010-04-09 19:52:11.574373195
+0200
+--- mkfontscale-1.0.7/mkfontscale.c.all-encodings	2009-01-22 16:09:20.000000000 +0100
++++ mkfontscale-1.0.7/mkfontscale.c	2010-04-09 19:52:11.574373195 +0200
 @@ -317,7 +317,7 @@ getName(FT_Face face, int nid)
      int i;
  
diff --git a/sources b/sources
index 3b2e751..91d9359 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 b0ebd86029571239b9d7b0c61191b591  fonttosfnt-1.0.3.tar.bz2
-9685fab33d39954ab8a0d22e0969d5a4  bdftopcf-1.0.1.tar.bz2
-96ca346f185c0ab48e42bf5bb0375da5  mkfontscale-1.0.7.tar.bz2
 9365ac66d19186eaf030482d312fca06  mkfontdir-1.0.5.tar.bz2
-6a56a1a93f2e07f0323db988e4ebfcce  font-util-1.1.2.tar.bz2
+4a7a4a848c43c42f7d499b60666434a4  bdftopcf-1.0.3.tar.bz2
+1bdd8ed070e02b2165d7b0f0ed93280b  font-util-1.2.0.tar.bz2
+5210c9385c6cc4a00ce829d8dc9c819b  mkfontscale-1.0.8.tar.bz2
diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index baa7f6a..dbeaf73 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -1,21 +1,22 @@
 %define pkgname font-utils
+%define mkfontscale 1.0.8
 
 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: 7.4
-Release: 3%{?dist}
+Version: 7.5
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.1.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.3.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.5.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.7.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.1.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-%{mkfontscale}.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.2.0.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
@@ -50,7 +51,9 @@ populated fonts.
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 #patch0 -p0 -b .font-util-mapdir-use-datadir-fix
 #patch1 -p0 -b .autoconf-add-with-fontdir-option
+pushd mkfontscale-%{mkfontscale}
 %patch2 -p1 -b .all-encodings
+popd
 
 %build
 # Build all apps
@@ -120,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com&gt; 1:7.5-1
+- font-util 1.2.0
+- mkfontscale 1.0.8
+- bdftopcf 1.0.3
+
 * Tue Oct 05 2010 Peter Hutterer <peter.hutterer(a)redhat.com&gt; 1:7.4-3
 - font-util 1.1.2