[pango/f18] Fix a compiler warning issue. (#902861)

[Akira TAGOH]

commit 4f90e6b9aee8b7c325b81b8aeec43c0d89e85e0f
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Jun 17 11:35:03 2013 +0900

    Fix a compiler warning issue. (#902861)

 pango-fix-pedantic-warning-in-pango-font-h.patch |   62 ++++++++++++++++++++++
 pango.spec                                       |    7 ++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/pango-fix-pedantic-warning-in-pango-font-h.patch b/pango-fix-pedantic-warning-in-pango-font-h.patch
new file mode 100644
index 0000000..ecff064
--- /dev/null
+++ b/pango-fix-pedantic-warning-in-pango-font-h.patch
@@ -0,0 +1,62 @@
+From 0493b1beb113118b9573f10a87f43814a78a788a Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Sun, 9 Dec 2012 19:49:29 -0500
+Subject: [PATCH] Bug 689882 - pango-font.h:381: error: comma at end of
+ enumerator list
+
+---
+ pango/pango-font.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index ce1a421..3d7aeb9 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -378,7 +378,7 @@ enum
+ {
+   PANGO_GLYPH_EMPTY =           ((PangoGlyph)0x0FFFFFFF),
+   PANGO_GLYPH_INVALID_INPUT =   ((PangoGlyph)0xFFFFFFFF),
+-  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000),
++  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000)
+ };
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+ 
+-- 
+1.8.1.4
+
+From 8c1a6ef147edceb05921bb892d620bdced277662 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sat, 29 Dec 2012 13:36:33 -0800
+Subject: [PATCH] Revert "Make PANGO_GLYPH flags an enum to make
+ gobject-introspection happy."
+
+This reverts commit 7274bd56db3ce2f02594687a307d22aa99c787c4.
+Whatever the problem was with g-ir-scanner, it's resolved.
+---
+ pango/pango-font.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index 3d7aeb9..eea27b4 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -374,12 +374,10 @@ struct _PangoFontClass
+ #define PANGO_UNKNOWN_GLYPH_HEIGHT 14
+ 
+ #endif /* PANGO_ENABLE_BACKEND */
+-enum
+-{
+-  PANGO_GLYPH_EMPTY =           ((PangoGlyph)0x0FFFFFFF),
+-  PANGO_GLYPH_INVALID_INPUT =   ((PangoGlyph)0xFFFFFFFF),
+-  PANGO_GLYPH_UNKNOWN_FLAG =    ((PangoGlyph)0x10000000)
+-};
++
++#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
++#define PANGO_GLYPH_INVALID_INPUT   ((PangoGlyph)0xFFFFFFFF)
++#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+ 
+ 
+-- 
+1.8.1.4
+
diff --git a/pango.spec b/pango.spec
index 82d5ab1..31f8e74 100644
--- a/pango.spec
+++ b/pango.spec
@@ -10,11 +10,12 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.32.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/pango
 Source: http://download.gnome.org/sources/pango/1.32/pango-%{version}.tar.xz
+Patch0: %{name}-fix-pedantic-warning-in-pango-font-h.patch
 URL: http://www.pango.org
 
 Requires: glib2 >= %{glib2_version}
@@ -62,6 +63,7 @@ for the pango package.
 
 %prep
 %setup -q -n pango-%{version}
+%patch0 -p1 -b .0-pedantic-warning
 
 %build
 
@@ -133,6 +135,9 @@ fi
 
 
 %changelog
+* Mon Jun 17 2013 Akira TAGOH <tagoh at redhat.com> - 1.32.3-2
+- Fix a compiler warning issue. (#902861)
+
 * Wed Nov 21 2012 Richard Hughes <hughsient at gmail.com> - 1.32.3-1
 - Update to 1.32.3