Broken qmake_qt4 in /usr/lib/rpm/macros.d/macros.qt4 (#1161927)

This commit is contained in:
Rex Dieter 2014-11-09 07:55:58 -06:00
parent cd4a130f36
commit e272059ea4
2 changed files with 6 additions and 3 deletions

View File

@ -24,7 +24,7 @@
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\ QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\ QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\
QMAKE_LFLAGS_DEBUG="${LDFLAGS:%{?__global_ldflags}}" \\\ QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{?__global_ldflags}}" \\\
QMAKE_LFLAGS_RELEASE="${LDFLAGS:%{?__global_ldflags}}" \\\ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{?__global_ldflags}}" \\\
QMAKE_STRIP= QMAKE_STRIP=

View File

@ -35,7 +35,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.6 Version: 4.8.6
Release: 16%{?dist} Release: 17%{?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
@ -1283,6 +1283,9 @@ fi
%changelog %changelog
* Sun Nov 09 2014 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.6-17
- Broken qmake_qt4 in /usr/lib/rpm/macros.d/macros.qt4 (#1161927)
* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.6-16 * Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.6-16
- macros.qt4: standalone, improved %%qmake_qt4 macro (sync'd with qt5 version) - macros.qt4: standalone, improved %%qmake_qt4 macro (sync'd with qt5 version)