From 29ab1f6769dec5ea37cfab0c000f9098f2a49670 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sun, 31 May 2015 21:41:19 +0200
Subject: [PATCH] Update to 1.37.0

- Remove modules support from packaging as it's gone upstream
---
 .gitignore |  1 +
 pango.spec | 35 ++++++++---------------------------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa6345b..b2470fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ pango-1.28.1.tar.bz2
 /pango-1.36.6.tar.xz
 /pango-1.36.7.tar.xz
 /pango-1.36.8.tar.xz
+/pango-1.37.0.tar.xz
diff --git a/pango.spec b/pango.spec
index 4154800..474dbb0 100644
--- a/pango.spec
+++ b/pango.spec
@@ -2,20 +2,19 @@
 %global pkgconfig_version 0.12
 %global freetype_version 2.1.5
 %global fontconfig_version 2.10.91
-%global cairo_version 1.7.6
+%global cairo_version 1.12.10
 %global libthai_version 0.1.9
 %global harfbuzz_version 0.9.9
 %global libXft_version 2.0.0
-%global bin_version 1.8.0
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.36.8
-Release: 5%{?dist}
+Version: 1.37.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/pango
-Source: http://download.gnome.org/sources/pango/1.36/pango-%{version}.tar.xz
+Source: http://download.gnome.org/sources/pango/1.37/pango-%{version}.tar.xz
 URL: http://www.pango.org
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -86,7 +85,6 @@ rm pango-view/pango-view.1.in
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
  %configure $CONFIGFLAGS \
           --enable-doc-cross-references \
-          --with-included-modules=basic-fc \
           --enable-installed-tests
 )
 make %{?_smp_mflags} V=1
@@ -98,7 +96,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Remove files that should not be packaged
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/pango/*/modules/*.la
 
 PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
 if ! test -e $PANGOXFT_SO; then
@@ -107,38 +104,18 @@ if ! test -e $PANGOXFT_SO; then
         exit 1
 fi
 
-# We need to have separate 32-bit and 64-bit pango-querymodules binaries
-# for places where we have two copies of the Pango libraries installed.
-# (we might have x86_64 and i686 packages on the same system, for example.)
-mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-%{__isa_bits}
-
-# and add a man page too
-echo ".so man1/pango-querymodules.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules-%{__isa_bits}.1
-
-touch $RPM_BUILD_ROOT%{_libdir}/pango/%{bin_version}/modules.cache
-
 %post
 /sbin/ldconfig
-/usr/bin/pango-querymodules-%{__isa_bits} --update-cache || :
 
 %postun
 /sbin/ldconfig
-if test $1 -gt 0; then
-  /usr/bin/pango-querymodules-%{__isa_bits} --update-cache || :
-fi
 
 %files
 %doc README AUTHORS COPYING NEWS
 %doc pango-view/HELLO.txt
 %{_libdir}/libpango*-*.so.*
-%{_bindir}/pango-querymodules*
 %{_bindir}/pango-view
 %{_mandir}/man1/pango-view.1.gz
-%{_mandir}/man1/pango-querymodules*
-%dir %{_libdir}/pango
-%dir %{_libdir}/pango/%{bin_version}
-%{_libdir}/pango/%{bin_version}/modules
-%ghost %{_libdir}/pango/%{bin_version}/modules.cache
 %{_libdir}/girepository-1.0/Pango-1.0.typelib
 %{_libdir}/girepository-1.0/PangoCairo-1.0.typelib
 %{_libdir}/girepository-1.0/PangoFT2-1.0.typelib
@@ -162,6 +139,10 @@ fi
 
 
 %changelog
+* Sun May 31 2015 Kalev Lember <kalevlember@gmail.com> - 1.37.0-1
+- Update to 1.37.0
+- Remove modules support from packaging as it's gone upstream
+
 * Thu May 14 2015 Matthias Clasen <mclasen@redhat.com> - 1.36.8-5
 - Regenerate man page for pango-view
 
diff --git a/sources b/sources
index f9d31fb..0bbf5ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-217a9a753006275215fa9fa127760ece  pango-1.36.8.tar.xz
+99969163d5b4695c93780487641878a0  pango-1.37.0.tar.xz