rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

macros.qt4: fix qmake_qt4 so "FOO=BAR %qmake_qt4" works as expected

Browse Source
This commit is contained in:
Rex Dieter 2015-06-16 10:39:23 -05:00
parent 88e9dfbe4b
commit d6ee4edd91
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.qt4
View File

@ -18,8 +18,7 @@
%_qt4_sysconfdir %{_sysconfdir} %_qt4_sysconfdir %{_sysconfdir}
%_qt4_translationdir %{_datadir}/qt4/translations %_qt4_translationdir %{_datadir}/qt4/translations
%qmake_qt4 \ %qmake_qt4 %{_qt4_qmake} \\\
%{_qt4_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
qt.spec
View File

@ -39,7 +39,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.7 Version: 4.8.7
Release: 2%{?dist} Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # 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 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -1314,6 +1314,9 @@ fi
%changelog %changelog
* Tue Jun 16 2015 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-3
- macros.qt4: fix qmake_qt4 so "FOO=BAR %%qmake_qt4" works as expected
* Tue Jun 09 2015 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-2 * Tue Jun 09 2015 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-2
- drop -reduce-relocations (f22+) - drop -reduce-relocations (f22+)