[mingw-tk] Update to 8.5.13 (fixes FTBFS caused by latest mingw-tcl)

[Erik van Pienbroek]

commit 1363f47947ef31427b4f751884fb00f04746a664
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jan 12 17:40:14 2013 +0100

    Update to 8.5.13 (fixes FTBFS caused by latest mingw-tcl)

 .gitignore             |    1 +
 mingw-tk.spec          |    9 +++++----
 sources                |    2 +-
 tk-8.5.6-mingw32.patch |   16 ----------------
 tk8.5-conf.patch       |    2 +-
 tk8.5-make.patch       |   18 +++++++++++-------
 6 files changed, 19 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7b5f50..6475545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tk8.5.9-src.tar.gz
+/tk8.5.13-src.tar.gz
diff --git a/mingw-tk.spec b/mingw-tk.spec
index 31c0eb7..860e7ed 100644
--- a/mingw-tk.spec
+++ b/mingw-tk.spec
@@ -4,14 +4,14 @@
 %global majorver1 8
 %global majorver2 5
 %global majorver %{majorver1}.%{majorver2}
-%global vers %{majorver}.9
+%global vers %{majorver}.13
 
 %global name1 tk
 
 Summary:   MinGW Windows graphical toolkit for the Tcl scripting language
 Name:      mingw-%{name1}
 Version:   %{vers}
-Release:   7%{?dist}
+Release:   1%{?dist}
 License:   TCL
 Group:     Development/Languages
 URL:       http://tcl.sourceforge.net/
@@ -20,7 +20,6 @@ Patch1:    tk8.5-make.patch
 Patch2:    tk8.5-conf.patch
 # this patch isn't needed since tk8.6b1
 Patch3:    tk-seg_input.patch
-Patch4:    tk-8.5.6-mingw32.patch
 Buildrequires: autoconf
 BuildRequires: file
 BuildRequires: m4
@@ -56,7 +55,6 @@ mv changes.utf8 changes
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .seg
-%patch4 -p1 -b .mingw32
 
 %build
 pushd win
@@ -127,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/%{name1}%{majorver}/ldAix
 %doc license.terms
 
 %changelog
+* Sat Jan 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.13-1
+- Update to 8.5.13 (fixes FTBFS caused by latest mingw-tcl)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.5.9-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 8b3d6a3..45a4236 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cdeb9feb61593f58a0ae61f2497580e  tk8.5.9-src.tar.gz
+1fc7dbb7495160756dbc805224afa360  tk8.5.13-src.tar.gz
diff --git a/tk8.5-conf.patch b/tk8.5-conf.patch
index f162035..c1eb31f 100644
--- a/tk8.5-conf.patch
+++ b/tk8.5-conf.patch
@@ -17,7 +17,7 @@ diff -up tk8.5.0/unix/tcl.m4.conf tk8.5.0/unix/tcl.m4
  	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
  	    AS_IF([test $do64bit = yes], [
 @@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
  
 -	    SHLIB_LD='${CC} -shared'
diff --git a/tk8.5-make.patch b/tk8.5-make.patch
index 27859e2..0b9bf4e 100644
--- a/tk8.5-make.patch
+++ b/tk8.5-make.patch
@@ -1,12 +1,16 @@
 diff -up tk8.5.2/unix/Makefile.in.ble tk8.5.2/unix/Makefile.in
 --- tk8.5.2/unix/Makefile.in.ble	2008-03-28 19:46:36.000000000 +0100
 +++ tk8.5.2/unix/Makefile.in	2008-05-19 14:45:52.000000000 +0200
-@@ -713,7 +713,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST
+@@ -716,10 +716,10 @@
  	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
--	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	@chmod 755 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
- 	@echo "Installing wish at EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
- 	@$(INSTALL_PROGRAM) wish at EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@
- 	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
+-	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
++	@chmod 755 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ 	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
+ 	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
+-	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
++	    chmod 755 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
+ 	fi
+ 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
+ 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"