From a29974f34bb01263ac9944139dc40f5600c270321038222f8a22c927508e8720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 25 Aug 2017 18:12:49 +0000 Subject: [PATCH] Accepting request 518798 from home:favogt:branches:Printing - Default to Qt5 on SLE 15 as well to avoid Qt4 with dependency on openSSL 1.0 OBS-URL: https://build.opensuse.org/request/show/518798 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=145 --- hplip.changes | 6 ++++++ hplip.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hplip.changes b/hplip.changes index cef66ed..4d120d4 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 25 17:29:47 UTC 2017 - fvogt@suse.com + +- Default to Qt5 on SLE 15 as well to avoid Qt4 with dependency on + openSSL 1.0 + ------------------------------------------------------------------- Tue Jul 11 13:29:58 UTC 2017 - mwilck@suse.com diff --git a/hplip.spec b/hplip.spec index 44c6a58..7210bc4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -32,8 +32,8 @@ BuildRequires: systemd-rpm-macros # For SLE11 redefine _libexecdir because on SLE11 _libexecdir is "/usr/lib64": %global _libexecdir %{_prefix}/lib %endif -# Use Qt5 frontend on TW and Leap >= 42.2 -%if 0%{?is_opensuse} && (0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200) +# Use Qt5 frontend on TW, Leap >= 42.2 and SLE >= 15 +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %global use_qt5 1 %else %global use_qt5 0