From 6467d02102d4242d6eeb8219eeeecc834746e514 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer@alumni.ethz.ch>
Date: Jun 13 2014 18:40:22 +0000
Subject: get rid of local zlib


---

diff --git a/mingw-tcl.spec b/mingw-tcl.spec
index fcf723e..58fa21d 100644
--- a/mingw-tcl.spec
+++ b/mingw-tcl.spec
@@ -164,6 +164,11 @@ mv $RPM_BUILD_ROOT/%{mingw64_libdir}/dde* $RPM_BUILD_ROOT/%{mingw64_libdir}/%{na
 mv $RPM_BUILD_ROOT/%{mingw32_libdir}/reg* $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}/
 mv $RPM_BUILD_ROOT/%{mingw64_libdir}/reg* $RPM_BUILD_ROOT/%{mingw64_libdir}/%{name1}%{majorver}/
 
+# remove local zlib
+rm -f $RPM_BUILD_ROOT/%{mingw32_bindir}/zlib1.dll
+rm -f $RPM_BUILD_ROOT/%{mingw64_bindir}/zlib1.dll
+
+
 %files -n mingw32-%{name1}
 %{mingw32_bindir}/%{name1}sh.exe
 %{mingw32_bindir}/%{name1}sh%{majorver1}%{majorver2}.exe
diff --git a/tcl-8.6.1-nativezlib.patch b/tcl-8.6.1-nativezlib.patch
index ecd550a..67b6c2e 100644
--- a/tcl-8.6.1-nativezlib.patch
+++ b/tcl-8.6.1-nativezlib.patch
@@ -1,23 +1,12 @@
 --- tcl8.6.1/win/configure.in.nativezlib	2014-06-13 19:22:02.929215500 +0200
-+++ tcl8.6.1/win/configure.in	2014-06-13 19:26:28.409707392 +0200
-@@ -135,7 +135,7 @@
-   tcl_ok=yes
- ])
- AS_IF([test "$tcl_ok" = "yes"], [
--  AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
-+  #dnl AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
-   AS_IF([test "$do64bit" = "yes"], [
-     AS_IF([test "$GCC" == "yes"],[
-       AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
-@@ -146,8 +146,10 @@
-     AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
-   ])
++++ tcl8.6.1/win/configure.in	2014-06-13 20:29:49.598364334 +0200
+@@ -148,6 +148,9 @@
  ], [
--  AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
-+  AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
+   AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
  ])
 +AC_SUBST(ZLIB_DLL_FILE,[])
-+AC_SUBST(ZLIB_OBJS,[-lz])
++AC_SUBST(ZLIB_OBJS,[])
++AC_SUBST(ZLIB_LIBS,[-lz])
  AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?])
  
  AC_CHECK_TYPE([intptr_t], [