[mingw-pango: 29/37] Update to 1.29.3 and dropped the dependency on the autotools by rewriting the patch

[Kalev Lember]

commit 4672c73e4ed6b5a42b204814712ba846a9e4b220
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Aug 30 20:31:24 2011 +0300

    Update to 1.29.3 and dropped the dependency on the autotools by rewriting the patch

 .gitignore                                   |    1 +
 mingw32-pango.spec                           |   25 +--
 pango-1.28.4-stop-using-G_CONST_RETURN.patch |  412 --------------------------
 pango_enable_static_build.patch              |   33 +--
 sources                                      |    2 +-
 5 files changed, 22 insertions(+), 451 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fed47b5..5b4c2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pango-1.28.1.tar.bz2
 /pango-1.28.3.tar.bz2
 /pango-1.28.4.tar.bz2
+/pango-1.29.3.tar.xz
diff --git a/mingw32-pango.spec b/mingw32-pango.spec
index 1e2fa69..064b57b 100644
--- a/mingw32-pango.spec
+++ b/mingw32-pango.spec
@@ -3,14 +3,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-pango
-Version:        1.28.4
-Release:        4%{?dist}
+Version:        1.29.3
+Release:        1%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.pango.org
-Source0:        http://download.gnome.org/sources/pango/1.28/pango-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/pango/1.29/pango-%{version}.tar.xz
 
 # Native pango uses a %post script to generate this, but the
 # pango-querymodules.exe binary is not something we can easily run on
@@ -22,9 +22,6 @@ Source0:        http://download.gnome.org/sources/pango/1.28/pango-%{version}.ta
 # wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules
 Source1:        pango.modules
 
-# from upstream (rebased)
-Patch0:         pango-1.28.4-stop-using-G_CONST_RETURN.patch
-
 Patch1000:      pango_enable_static_build.patch
 
 BuildArch:      noarch
@@ -46,12 +43,6 @@ BuildRequires:  mingw32-libpng
 BuildRequires:  mingw32-pixman
 BuildRequires:  pkgconfig
 
-# Required in order to rebuild the configure script.
-BuildRequires:  gtk-doc
-
-# These are required for the patch
-BuildRequires:  autoconf, automake, libtool
-
 Requires:       pkgconfig
 
 
@@ -73,14 +64,8 @@ Static version of the MinGW Windows Pango library.
 
 %prep
 %setup -q -n pango-%{version}
-%patch0 -p1 -b .const
 %patch1000
 
-# Regenerate the configure script
-aclocal
-autoreconf
-libtoolize
-
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -185,6 +170,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
   
 
 %changelog
+* Tue Aug 30 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.29.3-1
+- Update to 1.29.3
+- Dropped the dependency on the autotools by rewriting the patch
+
 * Sun Jul 10 2011 Kalev Lember <kalevlember at gmail.com> - 1.28.4-4
 - Stop using G_CONST_RETURN
 - Use automatic mingw dep extraction
diff --git a/pango_enable_static_build.patch b/pango_enable_static_build.patch
index 09941d0..809ddec 100644
--- a/pango_enable_static_build.patch
+++ b/pango_enable_static_build.patch
@@ -1,29 +1,22 @@
---- configure.in.orig	2009-02-20 20:37:09.166924103 +0100
-+++ configure.in	2009-02-20 20:37:20.893924816 +0100
-@@ -123,16 +123,16 @@
- AC_LIBTOOL_WIN32_DLL
- AM_DISABLE_STATIC
+--- configure.orig	2011-06-20 22:39:08.377416539 +0200
++++ configure	2011-06-20 22:40:46.959037254 +0200
+@@ -5852,19 +5852,6 @@
+ 
+ 
  
 -if test "$pango_os_win32" = "yes"; then
 -  if test x$enable_static = xyes -o x$enable_static = x; then
--    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
 -    enable_static=no
 -  fi
 -  if test x$enable_shared = xno; then
--    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
 -  fi
 -  enable_shared=yes
 -fi
-+#if test "$pango_os_win32" = "yes"; then
-+#  if test x$enable_static = xyes -o x$enable_static = x; then
-+#    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
-+#    enable_static=no
-+#  fi
-+#  if test x$enable_shared = xno; then
-+#    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
-+#  fi
-+#  enable_shared=yes
-+#fi
- 
- AM_PROG_LIBTOOL
- dnl when using libtool 2.x create libtool early, because it's used in configure
+-
+ case `pwd` in
+   *\ * | *\	*)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
diff --git a/sources b/sources
index c3f4993..7268ee1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f3989700f04e9117d30544a9078b3a0  pango-1.28.4.tar.bz2
+6ac4366d1e62c278e7191fa3b0c95080  pango-1.29.3.tar.xz