commit 470149e4f717f4492d91642ef6fb140a32e6b5f0 Author: Matthias Clasen mclasen@redhat.com Date: Tue Nov 22 16:41:01 2011 -0500
Fix patch
pango-lib64.patch | 33 +++++++++++++++++++++++++++++++++ pango.spec | 2 +- 2 files changed, 34 insertions(+), 1 deletions(-) --- diff --git a/pango-lib64.patch b/pango-lib64.patch new file mode 100644 index 0000000..eba365c --- /dev/null +++ b/pango-lib64.patch @@ -0,0 +1,33 @@ +diff -up pango-1.29.5/pango/Makefile.am.lib64 pango-1.29.5/pango/Makefile.am +--- pango-1.29.5/pango/Makefile.am.lib64 2011-11-22 13:59:54.000000000 -0500 ++++ pango-1.29.5/pango/Makefile.am 2011-11-22 16:39:49.407443964 -0500 +@@ -25,6 +25,7 @@ INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR="$(sysconfdir)" \ ++ -DHOST="$(host_triplet)" \ + -DLIBDIR="$(libdir)" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +diff -up pango-1.29.5/pango/Makefile.in.lib64 pango-1.29.5/pango/Makefile.in +--- pango-1.29.5/pango/Makefile.in.lib64 2011-11-22 14:07:59.000000000 -0500 ++++ pango-1.29.5/pango/Makefile.in 2011-11-22 16:40:20.090442868 -0500 +@@ -557,6 +557,7 @@ INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR="$(sysconfdir)" \ ++ -DHOST="$(host_triplet)" \ + -DLIBDIR="$(libdir)" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +diff -up pango-1.29.5/pango/modules.c.lib64 pango-1.29.5/pango/modules.c +--- pango-1.29.5/pango/modules.c.lib64 2011-08-15 21:11:08.000000000 -0400 ++++ pango-1.29.5/pango/modules.c 2011-11-22 16:38:52.317446005 -0500 +@@ -529,6 +529,7 @@ read_modules (void) + + if (!file_str) + file_str = g_build_filename (pango_get_sysconf_subdirectory (), ++ HOST, + "pango.modules", + NULL); + diff --git a/pango.spec b/pango.spec index 3cdca89..ab89a67 100644 --- a/pango.spec +++ b/pango.spec @@ -38,7 +38,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: gnome-common intltool gtk-doc
# Look for pango.modules in an arch-specific directory -Patch0: pango-1.21.4-lib64.patch +Patch0: pango-lib64.patch
%description Pango is a library for laying out and rendering of text, with an emphasis