From cbf3904adc8486b8fb0443bad287819393722c61093f9ffd654c3630302cc742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.com>
Date: Wed, 16 May 2012 02:54:04 +0000
Subject: [PATCH] Accepting request 121127 from
 home:a_faerber:branches:Virtualization

Drop hacks for enabling cURL support and use --enable-curl to force detection problems to fail the build. If there's some problem for someone it needs to be fixed upstream, not papered over.

OBS-URL: https://build.opensuse.org/request/show/121127
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=67
---
 qemu.changes | 5 +++++
 qemu.spec    | 5 +----
 qemu.spec.in | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/qemu.changes b/qemu.changes
index 06075f27..6c4e5e59 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 16 01:29:02 UTC 2012 - afaerber@suse.de
+
+- Remove workaround for forcing cURL detection
+
 -------------------------------------------------------------------
 Sun May 13 15:39:12 UTC 2012 - afaerber@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index 498c1995..0ed3494e 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -142,6 +142,7 @@ mkdir -p dynamic
 	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
 	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
 	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
+        --enable-curl \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
 	--enable-spice
@@ -151,10 +152,6 @@ mkdir -p dynamic
 %else
 	--disable-spice
 %endif
-# curl test fails for no reason in build system
-echo "CONFIG_CURL=y" >> config-host.mak
-echo "CURL_LIBS=-lcurl" >> config-host.mak
-echo "#define CONFIG_CURL 1" >> config-host.h
 make %{?jobs:-j%jobs} V=1
 make qemu-img V=1
 mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true
diff --git a/qemu.spec.in b/qemu.spec.in
index 0fa6d6f3..8e013860 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -115,10 +115,6 @@ mkdir -p dynamic
 %else
 	--disable-spice
 %endif
-# curl test fails for no reason in build system
-echo "CONFIG_CURL=y" >> config-host.mak
-echo "CURL_LIBS=-lcurl" >> config-host.mak
-echo "#define CONFIG_CURL 1" >> config-host.h
 make %{?jobs:-j%jobs} V=1
 make qemu-img V=1
 mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true