From 0fbfad81992fdd1281eac8076829b4f7facf12df823359cfc25977a6475c1744 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 20 Sep 2017 07:04:25 +0000 Subject: [PATCH] Accepting request 527352 from home:vitezslav_cizek:branches:server:database - Explicitly require libopenssl-1_0_0-devel, to successfully build once we switch openssl to 1.1 (bsc#1042632) OBS-URL: https://build.opensuse.org/request/show/527352 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=193 --- mariadb.changes | 6 ++++++ mariadb.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/mariadb.changes b/mariadb.changes index 261860e..e632dd4 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 19 15:54:05 UTC 2017 - vcizek@suse.com + +- Explicitly require libopenssl-1_0_0-devel, to successfully build + once we switch openssl to 1.1 (bsc#1042632) + ------------------------------------------------------------------- Mon Jul 10 11:30:59 UTC 2017 - kstreitova@suse.com diff --git a/mariadb.spec b/mariadb.spec index 86d258f..c0a3dfe 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -76,7 +76,12 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: lzo-devel BuildRequires: ncurses-devel +# Temporarily require OpenSSL 1.0.x until we update to 10.2 which builds fine with OpenSSL 1.1 +%if %{suse_version} < 1330 BuildRequires: openssl-devel +%else +BuildRequires: libopenssl-1_0_0-devel +%endif BuildRequires: pam-devel BuildRequires: pcre-devel BuildRequires: perl(Data::Dumper)