From 617c8510d7f78c519adff03bb1c622cf2494f239 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 27 Nov 2020 12:51:33 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/qt5-qtbase.git#ab8ab2c460a5c86b26bcbe20e298006dc6508067 --- qt5-qtbase.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 5c89d50..c91e3c7 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -37,7 +37,9 @@ %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) # use external qt_settings pkg +%if 0%{?fedora} %global qt_settings 1 +%endif %global journald -journald BuildRequires: pkgconfig(libsystemd) @@ -49,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -417,7 +419,7 @@ sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \ # are being worked on upstream and disabling LTO should be re-evaluated as # we update this change. Until such time... # Disable LTO -## TODO: please document this in a bug -- Rex +# https://bugzilla.redhat.com/1900527 %define _lto_cflags %{nil} ## FIXME/TODO: @@ -1044,6 +1046,9 @@ fi %changelog +* Fri Nov 27 2020 Jan Grulich - 5.15.2-3 +- Require qt-settings only in Fedora builds + * Mon Nov 23 2020 Rex Dieter - 5.15.2-2 - -no-reduce-relocations (#1900527)