[mingw32-pango] Update to 1.29.5 and various cleanups

[epienbro]

commit 246ef2b66aa80ac5ee576cbba41b87e5a7a0575e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jan 31 19:43:41 2012 +0100

    Update to 1.29.5 and various cleanups
    
    - Update to 1.29.5
    - Dropped all .la files
    - Dropped the .dll.a files for all pango modules
    - Dropped upstream patch
    - Rebuild against libpng 1.5

 .gitignore                             |    1 +
 mingw32-pango.spec                     |   48 +++++++++-----------------
 pango-workaround-bug653985-part2.patch |   59 --------------------------------
 sources                                |    2 +-
 4 files changed, 18 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5834457..83d7154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pango-1.28.1.tar.bz2
 /pango-1.28.4.tar.bz2
 /pango-1.29.3.tar.xz
 /pango-1.29.4.tar.xz
+/pango-1.29.5.tar.xz
diff --git a/mingw32-pango.spec b/mingw32-pango.spec
index 7b618bf..cf6fbf5 100644
--- a/mingw32-pango.spec
+++ b/mingw32-pango.spec
@@ -3,8 +3,8 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.29.4
-Release:        2%{?dist}
+Version:        1.29.5
+Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -23,7 +23,6 @@ Source0:        http://download.gnome.org/sources/pango/1.29/pango-%{version}.ta
 Source1:        pango.modules
 
 Patch1000:      pango_enable_static_build.patch
-Patch1002:      pango-workaround-bug653985-part2.patch
 
 BuildArch:      noarch
 
@@ -66,7 +65,6 @@ Static version of the MinGW Windows Pango library.
 %prep
 %setup -q -n pango-%{version}
 %patch1000
-%patch1002 -p1
 
 
 %build
@@ -88,6 +86,13 @@ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/*.def
 rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1
 rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
+
+# Drop the .dll.a files for all modules as nothing is supposed
+# to link directly to these modules
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/pango/1.6.0/modules/*.dll.a
+
 
 %files
 %doc COPYING
@@ -99,52 +104,24 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 %{_mingw32_bindir}/pango-view.exe
 %{_mingw32_includedir}/pango-1.0/
 %{_mingw32_libdir}/libpango-1.0.dll.a
-%{_mingw32_libdir}/libpango-1.0.la
 %{_mingw32_libdir}/libpangocairo-1.0.dll.a
-%{_mingw32_libdir}/libpangocairo-1.0.la
 %{_mingw32_libdir}/libpangoft2-1.0.dll.a
-%{_mingw32_libdir}/libpangoft2-1.0.la
 %{_mingw32_libdir}/libpangowin32-1.0.dll.a
-%{_mingw32_libdir}/libpangowin32-1.0.la
 %dir %{_mingw32_libdir}/pango
 %dir %{_mingw32_libdir}/pango/1.6.0
 %dir %{_mingw32_libdir}/pango/1.6.0/modules
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.la
 %{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.la
 %{_mingw32_libdir}/pkgconfig/pango.pc
 %{_mingw32_libdir}/pkgconfig/pangocairo.pc
 %{_mingw32_libdir}/pkgconfig/pangoft2.pc
@@ -172,6 +149,13 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
   
 
 %changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.29.5-1
+- Update to 1.29.5
+- Dropped all .la files
+- Dropped the .dll.a files for all pango modules
+- Dropped upstream patch
+- Rebuild against libpng 1.5
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.29.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 1983db7..9829d16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d5aba73897d2e8e8115b3f4fddbc0af  pango-1.29.4.tar.xz
+01441a5a4995ce65663ac0be34d7cc79  pango-1.29.5.tar.xz