From d0073a222e238bb83d48da56990aaf79c6817233c5ddec8eb1e8a64ab1126743 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 13 Sep 2019 15:38:52 +0000 Subject: [PATCH] Accepting request 730659 from home:vitezslav_cizek:branches:devel:libraries:c_c++ - Drop unnecessary requirement for OpenSSL 1.1.1 - Apply neon-0.30.2_ssl-fix_timeout_retvals.patch only when building with OpenSSL 1.1.1 (bsc#1149792) OBS-URL: https://build.opensuse.org/request/show/730659 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=55 --- neon.changes | 7 +++++++ neon.spec | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/neon.changes b/neon.changes index 1ff001e..df4c1b6 100644 --- a/neon.changes +++ b/neon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 12 10:44:58 UTC 2019 - Vítězslav Čížek + +- Drop unnecessary requirement for OpenSSL 1.1.1 +- Apply neon-0.30.2_ssl-fix_timeout_retvals.patch only when building + with OpenSSL 1.1.1 (bsc#1149792) + ------------------------------------------------------------------- Mon Aug 19 07:29:30 UTC 2019 - Ludwig Nussel diff --git a/neon.spec b/neon.spec index 1370066..2a4992a 100644 --- a/neon.spec +++ b/neon.spec @@ -36,12 +36,12 @@ Patch2: neon-0.30.2_ssl-fix_timeout_retvals.patch Patch3: neon-0.30.2-nulcert.patch BuildRequires: krb5-devel BuildRequires: libexpat-devel -BuildRequires: libopenssl-1_1-devel >= 1.1.1 BuildRequires: libproxy-devel BuildRequires: libtool BuildRequires: openssl BuildRequires: pkgconfig BuildRequires: zlib-devel +BuildRequires: pkgconfig(openssl) %description neon is an HTTP and WebDAV client library with a C interface. @@ -76,7 +76,9 @@ neon is an HTTP and WebDAV client library with a C interface. %ifarch ppc64le ppc64 %patch1 %endif +if pkg-config --atleast-version=1.1.1 openssl; then %patch2 -p1 +fi %patch3 -p1 %build