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
This commit is contained in:
Dirk Mueller 2019-09-13 15:38:52 +00:00 committed by Git OBS Bridge
parent dd2d3dc4fb
commit d0073a222e
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 12 10:44:58 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
- 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 <lnussel@suse.de> Mon Aug 19 07:29:30 UTC 2019 - Ludwig Nussel <lnussel@suse.de>

View File

@ -36,12 +36,12 @@ Patch2: neon-0.30.2_ssl-fix_timeout_retvals.patch
Patch3: neon-0.30.2-nulcert.patch Patch3: neon-0.30.2-nulcert.patch
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libopenssl-1_1-devel >= 1.1.1
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: openssl BuildRequires: openssl
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(openssl)
%description %description
neon is an HTTP and WebDAV client library with a C interface. 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 %ifarch ppc64le ppc64
%patch1 %patch1
%endif %endif
if pkg-config --atleast-version=1.1.1 openssl; then
%patch2 -p1 %patch2 -p1
fi
%patch3 -p1 %patch3 -p1
%build %build