rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

macros.qt5: fix qmake_qt5 so "FOO=BAR %qmake_qt5" works as expected

Browse Source
This commit is contained in:
Rex Dieter 2015-06-16 10:40:28 -05:00
parent 05d8ec8529
commit 67b459f056
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros.qt5
View File

@ -18,8 +18,7 @@
%_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_sysconfdir %{_qt5_settingsdir}
%_qt5_translationdir %{_datadir}/qt5/translations %_qt5_translationdir %{_datadir}/qt5/translations
%qmake_qt5 \ %qmake_qt5 %{_qt5_qmake} \\\
%{_qt5_qmake} \\\
QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\ QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\ QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\ QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\

5
qt5-qtbase.spec
View File

@ -42,7 +42,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.4.2 Version: 5.4.2
Release: 2%{?dist} Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -911,6 +911,9 @@ fi
%changelog %changelog
* Tue Jun 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.2-3
- macros.qt5: fix qmake_qt5 so "FOO=BAR %%qmake_qt5" works as expected
* Mon Jun 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.2-2 * Mon Jun 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.2-2
- rebase to latest SM patches (QTBUG-45484, QTBUG-46310) - rebase to latest SM patches (QTBUG-45484, QTBUG-46310)