[qt] Broken qmake_qt4 in /usr/lib/rpm/macros.d/macros.qt4 (#1161927)
Rex Dieter
rdieter at fedoraproject.org
Sun Nov 9 13:56:05 UTC 2014
commit e272059ea499acf7b50077f1c1c65f891e315cab
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Nov 9 07:55:58 2014 -0600
Broken qmake_qt4 in /usr/lib/rpm/macros.d/macros.qt4 (#1161927)
macros.qt4 | 4 ++--
qt.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/macros.qt4 b/macros.qt4
index 4ea0788..fe456b1 100644
--- a/macros.qt4
+++ b/macros.qt4
@@ -24,7 +24,7 @@
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\
- QMAKE_LFLAGS_DEBUG="${LDFLAGS:%{?__global_ldflags}}" \\\
- QMAKE_LFLAGS_RELEASE="${LDFLAGS:%{?__global_ldflags}}" \\\
+ QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{?__global_ldflags}}" \\\
+ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{?__global_ldflags}}" \\\
QMAKE_STRIP=
diff --git a/qt.spec b/qt.spec
index d2a4522..151f3cc 100644
--- a/qt.spec
+++ b/qt.spec
@@ -35,7 +35,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.6
-Release: 16%{?dist}
+Release: 17%{?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
@@ -1283,6 +1283,9 @@ fi
%changelog
+* Sun Nov 09 2014 Rex Dieter <rdieter at 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 at fedoraproject.org> 1:4.8.6-16
- macros.qt4: standalone, improved %%qmake_qt4 macro (sync'd with qt5 version)
More information about the scm-commits
mailing list