From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 3 Mar 2016 12:09:30 +0000 (+0200)
Subject: curl rebuild
X-Git-Tag: auto/th/openssl-1.0.2g-5~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=daa4508;ds=sidebyside

curl rebuild

configure:29155: checking for curl_easy_perform in -lcurl
configure:29180: ccache gcc -o conftest -O2 -fwrapv -pipe -Wformat -Werror=format-security -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wp,-D_FORTIFY_SOURCE=2
/usr/lib/gcc/i686-pld-linux/5.3.0/../../../libcurl.so: undefined reference to `SSLv2_client_method'
collect2: error: ld returned 1 exit status

altho this dependency is compile time, it's easier to mark it here than
all rebuilt programs that link with curl (php55-openssl, php56-openssl, ...)
---

diff --git a/openssl.spec b/openssl.spec
index 30a3438..9de49ed 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -66,6 +66,7 @@ Conflicts:	openssh-clients < 2:5.8p1-9
 Conflicts:	openssh-server < 2:5.8p1-9
 %else
 Conflicts:	apache-mod_ssl < 1:2.2.31-4
+Conflicts:	curl-libs < 7.47.1-2
 Conflicts:	neon < 0.29.6-8
 Conflicts:	openssh-clients < 2:6.2p2-3
 Conflicts:	openssh-server < 2:6.2p2-3