From bbe68167732beaaf1b6bf4b7fda9d233654f849213894e41f90e71f8fae6c72c Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 10 Sep 2012 11:09:23 +0000
Subject: [PATCH] Accepting request 133414 from
 home:Zaitor:branches:GNOME:Factory

Update to ver 1.31.1, builds for G:N, should it be SR'd there too/instead?

OBS-URL: https://build.opensuse.org/request/show/133414
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=83
---
 pango-1.31.0.tar.xz |  3 ---
 pango-1.31.1.tar.xz |  3 +++
 pango.changes       | 13 +++++++++++++
 pango.spec          |  2 +-
 pango64.patch       | 16 ++++++++--------
 5 files changed, 25 insertions(+), 12 deletions(-)
 delete mode 100644 pango-1.31.0.tar.xz
 create mode 100644 pango-1.31.1.tar.xz

diff --git a/pango-1.31.0.tar.xz b/pango-1.31.0.tar.xz
deleted file mode 100644
index 9c80561..0000000
--- a/pango-1.31.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bac8eec76710150a6f7a40b565d8c7b0cfb946fa2879a19fae8f7563b551eb96
-size 1022764
diff --git a/pango-1.31.1.tar.xz b/pango-1.31.1.tar.xz
new file mode 100644
index 0000000..631c860
--- /dev/null
+++ b/pango-1.31.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81
+size 1031940
diff --git a/pango.changes b/pango.changes
index cb067cd..265c47d 100644
--- a/pango.changes
+++ b/pango.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Sep  9 19:54:00 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 1.31.1:
+  + The module cache file can now be located in libdir.
+  + Initial work towards making pango thread-safe.
+  + Update to Unicode 6.1.
+  + Bugs fixed: bgo#682421, bgo#678721, bgo#678997, bgo#653347,
+    bgo#682952.
+  + Deprecate pango-ot.h, pango_fc_font_kern_glyphs and
+    pango_lookup_aliases
+- Rebased pango64.patch.
+
 -------------------------------------------------------------------
 Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org
 
diff --git a/pango.spec b/pango.spec
index 954120f..b436ae0 100644
--- a/pango.spec
+++ b/pango.spec
@@ -20,7 +20,7 @@
 %define pango_binary_version 1.8.0
 
 Name:           pango
-Version:        1.31.0
+Version:        1.31.1
 Release:        0
 Summary:        Library for Layout and Rendering of Text
 License:        LGPL-2.1+
diff --git a/pango64.patch b/pango64.patch
index 2b63a19..ecf40a0 100644
--- a/pango64.patch
+++ b/pango64.patch
@@ -38,15 +38,15 @@ Index: pango/modules.c
         * such a package contains paths from the package
         * builder's machine. Replace the path with the real
         * one on this machine. */
-@@ -509,7 +509,7 @@ read_modules (void)
+@@ -537,7 +537,7 @@
+       files = g_new (char *, 3);
  
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
--				 "pango.modules",
-+				 "pango64.modules",
- 				 NULL);
- 
-   files = pango_split_file_list (file_str);
+       files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
+-                                   "pango.modules",
++                                   "pango64.modules",
+                                    NULL);
+       files[1] = g_build_filename (pango_get_lib_subdirectory (),
+                                    MODULE_VERSION,
 @@ -620,7 +620,7 @@ build_map (PangoMapInfo *info)
        if (!no_module_warning)
  	{