Author: whot
Update of /cvs/pkgs/rpms/libfontenc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25120
Modified Files:
libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
libfontenc.spec
Log Message:
* Fri Aug 28 2009 Peter Hutterer <peter.hutte...@redhat.com> 1.0.5-2
- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.
libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
===================================================================
RCS file:
/cvs/pkgs/rpms/libfontenc/devel/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch 16 Dec 2005 11:11:51
-0000 1.1
+++ libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch 28 Aug 2009 06:16:09
-0000 1.2
@@ -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"
Index: libfontenc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libfontenc.spec 28 Aug 2009 05:54:37 -0000 1.29
+++ libfontenc.spec 28 Aug 2009 06:16:09 -0000 1.30
@@ -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.hutte...@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.hutte...@redhat.com> 1.0.5-1
- libfontenc 1.0.5
_______________________________________________
Fedora-fonts-bugs-list mailing list
Fedora-fonts-bugs-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list
