From 276e67ad3a42e8b790c0b645592f7ddf31f0378e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Dec 2016 11:11:58 -0600 Subject: [PATCH] disable openssl11 (FTBFS) and use compat-openssl10 for now --- qt5-qtbase.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 03bd130..28996b2 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -24,9 +24,9 @@ # set to 1 to enable bootstrap %global bootstrap 0 -# set to 1 for openssl-1.1.x support %if 0%{?fedora} > 25 || 0%{?rhel} > 7 -%global openssl11 1 +# set to 1 for openssl-1.1.x support +#global openssl11 1 %global firebird3x 1 %endif @@ -150,15 +150,16 @@ BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(ice) pkgconfig(sm) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) -#if 0%{?fedora} > 25 || 0%{?rhel} > 7 -%if 0 -%global openssl -openssl +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 +%global openssl -openssl-linked +BuildRequires: compat-openssl10-devel +#global openssl -openssl # since openssl is loaded dynamically, add an explicit dependency -Requires: openssl-libs%{?_isa} +#Requires: openssl-libs%{?_isa} %else %global openssl -openssl-linked -%endif BuildRequires: pkgconfig(openssl) +%endif BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) %if 0%{?fedora} %global xkbcommon -system-xkbcommon @@ -956,7 +957,7 @@ fi %changelog * Wed Dec 07 2016 Rex Dieter - 5.7.1-4 -- use -openssl-linked (bug #1401459) +- disable openssl11 (for now, FTBFS), use -openssl-linked (bug #1401459) - BR: perl-generators * Mon Nov 28 2016 Than Ngo - 5.7.1-3