- added freetype patch to use freetype2 headers, not conflicting freetype 1.x

Changed files:
    pango-freetype.patch -> 1.1
    pango.spec -> 1.56

diff --git a/pango-freetype.patch b/pango-freetype.patch
new file mode 100644 (file)
index 0000000..fba6fb6
--- /dev/null
+++ b/pango-freetype.patch
@@ -0,0 +1,11 @@
+--- pango-1.1.1/examples/Makefile.am.orig      Fri Aug  9 03:39:48 2002
++++ pango-1.1.1/examples/Makefile.am   Sun Oct  6 19:01:26 2002
+@@ -2,7 +2,7 @@
+ 
+ aliasdir = $(sysconfdir)/pango
+ 
+-INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS)
++INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(FREETYPE_CFLAGS) $(GLIB_CFLAGS) $(FONTCONFIG_CFLAGS)
+ 
+ ###################################################
+ 

diff --git a/pango.spec b/pango.spec
index 157d086645e4136542483cacedb574a0566579bd..0cc449f77172dceca43c07af40bfc82d8f1c6307 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -8,6 +8,7 @@ License:        LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.gtk.org/pub/gtk/v2.1/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-Xft2.patch
+Patch1:                %{name}-freetype.patch
 URL:           http://www.pango.org/
 Requires:      freetype >= 2.1.2
 BuildRequires: autoconf
@@ -82,6 +83,7 @@ internacionalizado.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing acinclude.m4