rely on qmake's CXXFLAGS; rel 2

passing CXXFLAGS in environment overrides flags added by qt completely
resulting in build failure due to missing -fPIC. while it's possible to
add additional flags by means of:

qmake 'QMAKE_CFLAGS+=${QMAKE_CFLAGS}'

they're always prepended, never appended so qmake's flags take
precedence anyway. since build time %{rpmcxxflags} are already part of
qmake's flags let's just rely on them.

diff --git a/highlight.spec b/highlight.spec
index 61d90fe83c0c54150a90b19b567750645e3b0628..2bd9809f3bcf1f82375eb8db8681fa7de66a9a15 100644 (file)
--- a/highlight.spec
+++ b/highlight.spec
@@ -6,7 +6,7 @@ Summary:        A source code converter to HTML, XHTML, RTF, TeX, LaTeX, XSL-FO, and XM
 Summary(pl.UTF-8):     Konwerter kodu źródłowego do formatów HTML, XHTML, RTF, TeX, LaTeX, XSL-FO oraz XML
 Name:          highlight
 Version:       3.49
-Release:       1
+Release:       2
 License:       GPL v3
 Group:         Applications/Publishing
 Source0:       http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
@@ -79,8 +79,7 @@ RTF, TeX, LaTeX, XSL-FO, and XML.
        CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %{__make} gui \
        QMAKE=qmake-qt5 \
-       CXX="%{__cxx}" \
-       CXXFLAGS="%{rpmcxxflags} -std=c++11 "'$(DEFINES)'
+       CXX="%{__cxx}"
 
 %{?with_apidocs:%{__make} apidocs}