[mingw-tk: 6/10] Fix the compilation with the mingw-w64 toolchain

[Kalev Lember]

commit b13d509914a56cbc5acc9a01652b5dff799c8f01
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Feb 27 21:57:14 2012 +0100

    Fix the compilation with the mingw-w64 toolchain

 mingw32-tk.spec        |    2 ++
 tk-8.5.6-mingw32.patch |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-tk.spec b/mingw32-tk.spec
index 0978cb0..7373503 100644
--- a/mingw32-tk.spec
+++ b/mingw32-tk.spec
@@ -56,6 +56,7 @@ mv changes.utf8 changes
 %build
 pushd win
 autoconf
+MINGW32_CFLAGS="%{_mingw32_cflags} -D_WIN32_IE=0x0501"
 %{_mingw32_configure} --with-tcl=%{_mingw32_libdir}/tcl%{majorver} 
 # builds fail sometimes with %%{?_smp_mflags}, so don't use
 sed -i -e 's,mingw32-tcl,tcl,g' Makefile
@@ -128,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.9-4
 - Rebuild against the mingw-w64 toolchain
+- Fix the compilation with the mingw-w64 toolchain
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.5.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/tk-8.5.6-mingw32.patch b/tk-8.5.6-mingw32.patch
index 15e8590..896c9d9 100644
--- a/tk-8.5.6-mingw32.patch
+++ b/tk-8.5.6-mingw32.patch
@@ -8,9 +8,9 @@ diff -Naur tk8.5.7/win/configure.in tk8.5.7-new/win/configure.in
 -    AC_CHECK_PROG(AR, ar, ar)
 -    AC_CHECK_PROG(RANLIB, ranlib, ranlib)
 -    AC_CHECK_PROG(RC, windres, windres)
-+    AC_CHECK_PROG(AR, i686-pc-mingw32-ar, i686-pc-mingw32-ar)
-+    AC_CHECK_PROG(RANLIB, i686-pc-mingw32-ranlib, i686-pc-mingw32-ranlib)
-+    AC_CHECK_PROG(RC, i686-pc-mingw32-windres, i686-pc-mingw32-windres)
++    AC_CHECK_PROG(AR, i686-w64-mingw32-ar, i686-w64-mingw32-ar)
++    AC_CHECK_PROG(RANLIB, i686-w64-mingw32-ranlib, i686-w64-mingw32-ranlib)
++    AC_CHECK_PROG(RC, i686-w64-mingw32-windres, i686-w64-mingw32-windres)
  
      if test "${AR}" = "" ; then
  	AC_MSG_ERROR([Required archive tool 'ar' not found on PATH.])