diff --git a/macros.qt4 b/macros.qt4 index fe456b1..791a6dd 100644 --- a/macros.qt4 +++ b/macros.qt4 @@ -18,8 +18,7 @@ %_qt4_sysconfdir %{_sysconfdir} %_qt4_translationdir %{_datadir}/qt4/translations -%qmake_qt4 \ - %{_qt4_qmake} \\\ +%qmake_qt4 %{_qt4_qmake} \\\ QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\ QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\ QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\ diff --git a/qt.spec b/qt.spec index 67ec0b7..b67b1a4 100644 --- a/qt.spec +++ b/qt.spec @@ -39,7 +39,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.7 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -1314,6 +1314,9 @@ fi %changelog +* Tue Jun 16 2015 Rex Dieter 1:4.8.7-3 +- macros.qt4: fix qmake_qt4 so "FOO=BAR %%qmake_qt4" works as expected + * Tue Jun 09 2015 Rex Dieter 1:4.8.7-2 - drop -reduce-relocations (f22+)