From bcd2e9c14fd7096cb8ab2fdc7e300e149cd00503 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@fedoraproject.org>
Date: Sep 20 2004 17:25:09 +0000
Subject: - Version 1.6.0

- Add patch from CVS to fix bitmap-fonts/no-hint problem (#129246)

---

diff --git a/.cvsignore b/.cvsignore
index 1790a46..65de50b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pango-1.5.2.tar.bz2
+pango-1.6.0.tar.bz2
diff --git a/pango.spec b/pango.spec
index d697c8c..4d33d71 100644
--- a/pango.spec
+++ b/pango.spec
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 1.5.2
-Release: 3
+Version: 1.6.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
@@ -31,8 +31,8 @@ Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 Patch1: pango-slighthint.patch
 # Look for pango.modules in an arch-specific directory
 Patch5: pango-1.2.5-lib64.patch
-# Patch from CVS to fix crashes with left-matra fixups
-Patch6: pango-1.5.2-leftmatra.patch
+# Patch from CVS to fix metrics for bitmap fonts
+Patch6: pango-1.5.2-bitmapmetrics.patch
 
 %description
 Pango is a system for layout and rendering of internationalized text.
@@ -60,7 +60,7 @@ pango.
 
 %patch1 -p1 -b .slighthint
 %patch5 -p1 -b .lib64
-%patch6 -p0 -b .leftmatra
+%patch6 -p1 -b .bitmapmetrics
 
 %build
 
@@ -187,6 +187,10 @@ esac
 
 
 %changelog
+* Mon Sep 20 2004 Owen Taylor <otaylor@redhat.com> - 1.6.0-1
+- Version 1.6.0
+- Add patch from CVS to fix bitmap-fonts/no-hint problem (#129246)
+
 * Wed Sep  8 2004 Jeremy Katz <katzj@redhat.com> - 1.5.2-3
 - fix running of pango-query-modules to have necessary libraries available
   (#132052)
diff --git a/sources b/sources
index 9946343..5967630 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c171825dfa40ddb36bdc00cc57f3a171  pango-1.5.2.tar.bz2
+6c732bbc5fba5a0f1f8086e8aa4f490d  pango-1.6.0.tar.bz2