From cdd43d585975c29a3574e57ba39e40eb3b6b00d1 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Nov 10 2009 19:08:06 +0000
Subject: - font-util 1.1.0


---

diff --git a/.cvsignore b/.cvsignore
index 0f4556d..aee94d1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ mkfontscale-1.0.1.tar.bz2
 bdftopcf-1.0.1.tar.bz2
 mkfontscale-1.0.7.tar.bz2
 mkfontdir-1.0.5.tar.bz2
+font-util-1.1.0.tar.bz2
diff --git a/sources b/sources
index 90903e1..ca7a70e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 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
+9538043de60d685fc4253b0dc2924d58  font-util-1.1.0.tar.bz2
diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index ad66cfe..c2e72fa 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 7.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -15,7 +15,7 @@ Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.1.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.0.1.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.1.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
@@ -47,8 +47,8 @@ populated fonts.
 
 %prep
 %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
+#patch0 -p0 -b .font-util-mapdir-use-datadir-fix
+#patch1 -p0 -b .autoconf-add-with-fontdir-option
 
 %build
 # Build all apps
@@ -61,7 +61,8 @@ populated fonts.
             autoconf
             ;;
       esac
-      %configure
+      # this --with-mapdir should be redundant?
+      %configure --with-mapdir=%{_datadir}/X11/fonts/util
       make
       popd
    done
@@ -113,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 10 2009 Adam Jackson <ajax@redhat.com> 7.2-11
+- font-util 1.1.0
+
 * Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 7.2-10
 - mkfontscale 1.0.7
 - mkfontdir 1.0.5