From 8f4e73873a143dcfdd24ea1d41d9c4a4bd7c76f1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 13 Feb 2016 06:55:22 -0600 Subject: [PATCH] macros.qt5: fix %qt5_ldflags macro --- macros.qt5 | 2 +- qt5-qtbase.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index ff37ef0..ee9b259 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -18,7 +18,7 @@ %_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_translationdir %{_datadir}/qt5/translations -%_qt5_ldflags %{?__global_ldflags} @@QT5_RPM_LD_FLAGS@ +%_qt5_ldflags %{?__global_ldflags} @@QT5_RPM_LD_FLAGS@@ %_qt5_optflags %{optflags} @@QT5_RPM_OPT_FLAGS@@ %_qt5_qmake_flags \\\ diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 28a3a57..a7bc436 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -44,7 +44,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 0.24.%{prerelease}%{?dist} +Release: 0.25.%{prerelease}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -930,6 +930,9 @@ fi %changelog +* Sat Feb 13 2016 Rex Dieter 5.6.0-0.25.beta +- macros.qt5: fix %%qt5_ldflags macro + * Thu Feb 11 2016 Than Ngo - 5.6.0-0.24.beta - fix build issue with gcc6 - fix check for alsa 1.1.x