From c23d98cae57c04ae8a25eb42362cc25ee55b8650 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 3 Feb 2009 02:03:48 +0000
Subject: [PATCH] o Revert the temporary GTK DLL workaround (r11899) which
 added   duplicate DLL files to the distribution.  David found that using a  
 different GTK download fixed the problem (see  
 docs/win32-installer-zenmap-buildguide.txt) and Fyodor was able to  
 reproduce and implement.

---
 CHANGELOG             | 6 ++++++
 mswin32/nsis/Nmap.nsi | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 02b433737..497d645fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Revert the temporary GTK DLL workaround (r11899) which added
+  duplicate DLL files to the distribution.  David found that using a
+  different GTK download fixed the problem (see
+  docs/win32-installer-zenmap-buildguide.txt) and Fyodor was able to
+  reproduce and implement.
+
 o The conditions for printing OS fingerprints to XML output are now
   the same as are used to decide whether to print them in the other
   formats. So they will be printed if submission is desirable,
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 2be843f61..eef339d55 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -240,7 +240,7 @@ Section "Zenmap (GUI Frontend)" SecZenmap
   File ..\nmap-${VERSION}\zenmap.exe
   File ..\nmap-${VERSION}\ZENMAP_README
   File ..\nmap-${VERSION}\COPYING_HIGWIDGETS
-  File ..\nmap-${VERSION}\*.dll
+  File ..\nmap-${VERSION}\python26.dll
   File /r ..\nmap-${VERSION}\share
   File /r ..\nmap-${VERSION}\py2exe
   StrCpy $zenmapset "true"