From 02959124791830bad7762abd105e5934cccde60e Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Fri, 9 Sep 2011 11:49:49 -0400
Subject: [PATCH] Update gitian build descriptors to produce proper builds.

Thanks to makomk for finding the bugs here and devrandom
for passing them along (see
https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312)
---
 contrib/gitian-win32.yml | 1 +
 contrib/gitian.yml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/gitian-win32.yml b/contrib/gitian-win32.yml
index 963c3813..52b10bc3 100644
--- a/contrib/gitian-win32.yml
+++ b/contrib/gitian-win32.yml
@@ -10,6 +10,7 @@ packages:
 - "unzip"
 - "nsis"
 - "faketime"
+- "wine"
 reference_datetime: "2011-01-30 00:00:00"
 remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
diff --git a/contrib/gitian.yml b/contrib/gitian.yml
index 8d0abf89..efa9cb8c 100644
--- a/contrib/gitian.yml
+++ b/contrib/gitian.yml
@@ -34,7 +34,7 @@ script: |
   mkdir wxWidgets-2.9.2
   cd wxWidgets-2.9.2
   unzip ../wxWidgets-2.9.2-x32-gitian.zip
-  unzip -f ../wxWidgets-2.9.2-x64-gitian.zip
+  unzip -o ../wxWidgets-2.9.2-x64-gitian.zip
   cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config
   for lib in wx_gtk2u wxregexu wxtiff; do
     ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o