From 2170d66712eed28e9e54704980b59b280fa25731 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Aug 28 2009 06:16:09 +0000
Subject: - libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.


---

diff --git a/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch b/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
index cebf1eb..ceaf43f 100644
--- a/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
+++ b/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
@@ -1,11 +1,13 @@
---- ./configure.ac.get-fontdir-from-pkgconfig	2005-12-16 03:10:56.000000000 -0500
-+++ ./configure.ac	2005-12-16 03:11:25.000000000 -0500
-@@ -35,7 +35,7 @@
+diff --git ./configure.ac ./configure.ac
+index fc28ef9..63ef0c8 100644
+--- ./configure.ac
++++ ./configure.ac
+@@ -37,7 +37,7 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ XORG_CWARNFLAGS
  
- m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
- 
--DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-+DEFAULT_ENCODINGSDIR=$(pkg-config --variable=fontdir fontutil)/encodings
- AC_ARG_WITH(encodingsdir,
- 	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]),
- 	[ENCODINGSDIR="$withval"],
+-encodingsdir=${libdir}/X11/fonts/encodings
++encodingsdir=$(pkg-config --variable=fontdir fontutil)/encodings
+ AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
+ 	[Path to font encodings]), [encodingsdir="$withval"])
+ ENCODINGSDIR="$encodingsdir"
diff --git a/libfontenc.spec b/libfontenc.spec
index 627af33..a68e997 100644
--- a/libfontenc.spec
+++ b/libfontenc.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.0.5-2
+- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.0.5-1
 - libfontenc 1.0.5