From 338f392be18822e66320e217b2a77470db8375bd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 1 Jan 1970 00:00:00 +0000
Subject: [PATCH] A few more fixes

---
 openssl/mingw32-openssl.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openssl/mingw32-openssl.spec b/openssl/mingw32-openssl.spec
index fb6e28b..a293c47 100644
--- a/openssl/mingw32-openssl.spec
+++ b/openssl/mingw32-openssl.spec
@@ -175,8 +175,9 @@ export WINEDLLPATH
 # it).  Therefore we create a virtual framebuffer for the duration of
 # the tests.
 # XXX There is no good way to choose a random, unused display.
+unset DISPLAY
 display=:21
-Xvfb $display & xpid=$!
+Xvfb $display -ac -noreset & xpid=$!
 trap "kill -TERM $xpid ||:" EXIT
 sleep 3
 DISPLAY=$display
@@ -185,10 +186,10 @@ export DISPLAY
 make LDCMD=%{_mingw32_cc} -C test apps tests
 
 # Disable this thread test, because we don't have pthread on Windows.
-#%{_mingw32_cc} -o openssl-thread-test \
+#%-{_mingw32_cc} -o openssl-thread-test \
 #  -I./include \
-#  %{_mingw32_cflags} \
-#  %{SOURCE8} \
+#  %-{_mingw32_cflags} \
+#  %-{SOURCE8} \
 #  -L. \
 #  -lssl -lcrypto \
 #  -lpthread -lz -ldl
-- 
1.8.3.1