[qt] macros.qt4: standalone, improved %qmake_qt4 macro (sync'd with qt5 version)

[Rex Dieter]

commit cd4a130f3674eac8b917a339cbed1d4d619157a2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 3 08:39:45 2014 -0600

    macros.qt4: standalone, improved %qmake_qt4 macro (sync'd with qt5 version)

 macros.qt4 |   30 ++++++++++++++++++++++++++++++
 qt.spec    |   44 ++++++++++++++------------------------------
 2 files changed, 44 insertions(+), 30 deletions(-)
---
diff --git a/macros.qt4 b/macros.qt4
new file mode 100644
index 0000000..4ea0788
--- /dev/null
+++ b/macros.qt4
@@ -0,0 +1,30 @@
+%_qt4 @@NAME@@
+%_qt4_epoch @@EPOCH@@
+%_qt4_version @@VERSION@@
+%_qt4_evr @@EVR@@
+%_qt48 %{_qt4_version}
+%_qt4_prefix %{_libdir}/qt4
+%_qt4_bindir %{_qt4_prefix}/bin
+%_qt4_datadir %{_qt4_prefix}
+%_qt4_demosdir %{_qt4_prefix}/demos
+%_qt4_docdir %{_docdir}/qt4
+%_qt4_examples %{_qt4_prefix}/examples
+%_qt4_examplesdir %{_qt4_prefix}/examples
+%_qt4_headerdir %{_includedir}
+%_qt4_importdir %{_qt4_prefix}/imports
+%_qt4_libdir %{_libdir}
+%_qt4_plugindir %{_qt4_prefix}/plugins
+%_qt4_qmake %{_qt4_bindir}/qmake
+%_qt4_sysconfdir %{_sysconfdir}
+%_qt4_translationdir %{_datadir}/qt4/translations 
+
+%qmake_qt4 \
+  %{_qt4_qmake} \\\
+  QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\
+  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_STRIP=
+
diff --git a/qt.spec b/qt.spec
index 2f61c43..d2a4522 100644
--- a/qt.spec
+++ b/qt.spec
@@ -35,7 +35,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.6
-Release: 15%{?dist}
+Release: 16%{?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
@@ -225,7 +225,8 @@ Source31: hi48-app-qt4-logo.png
 %define tds -no-sql-tds
 %endif
 
-# See http://bugzilla.redhat.com/196901
+# macros, be mindful to keep sync'd with macros.qt4
+Source1: macros.qt4
 %define _qt4 %{name}
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
@@ -872,34 +873,14 @@ Version: %{version}
 EOF
 
 # rpm macros
-mkdir -p %{buildroot}%{rpm_macros_dir}
-cat >%{buildroot}%{rpm_macros_dir}/macros.qt4<<EOF
-%%_qt4 %{name}
-%%_qt48 %{version}
-%%_qt4_epoch %{epoch}
-%%_qt4_version %{version}
-%%_qt4_evr %{epoch}:%{version}-%{release}
-%%_qt4_prefix %%{_libdir}/qt4
-%%_qt4_bindir %%{_qt4_prefix}/bin
-%%_qt4_datadir %%{_qt4_prefix}
-%%_qt4_demosdir %%{_qt4_prefix}/demos
-%%_qt4_docdir %%{_docdir}/qt4
-%%_qt4_examples %%{_qt4_prefix}/examples
-%%_qt4_examplesdir %%{_qt4_prefix}/examples
-%%_qt4_headerdir %%{_includedir}
-%%_qt4_importdir %%{_qt4_prefix}/imports
-%%_qt4_libdir %%{_libdir}
-%%_qt4_plugindir %%{_qt4_prefix}/plugins
-%%_qt4_qmake %%{_qt4_bindir}/qmake
-%%_qt4_sysconfdir %%{_sysconfdir}
-%%_qt4_translationdir %%{_datadir}/qt4/translations 
-
-%%qmake_qt4 \\
-  %%{_qt4_qmake} \\\\\\
-    QMAKE_CFLAGS="\${CFLAGS:-%%optflags}" \\\\\\
-    QMAKE_CXXFLAGS="\${CXXFLAGS:-%%optflags}" \\\\\\
-    QMAKE_LFLAGS="\${LDFLAGS:-%%?__global_ldflags}"
-EOF
+install -p -m644 -D %{SOURCE1} \
+  %{buildroot}%{rpm_macros_dir}/macros.qt4
+sed -i \
+  -e "s|@@NAME@@|%{name}|g" \
+  -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
+  -e "s|@@VERSION@@|%{version}|g" \
+  -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
+  %{buildroot}%{rpm_macros_dir}/macros.qt4
 
 # create/own stuff under %%_qt4_docdir
 mkdir -p %{buildroot}%{_qt4_docdir}/{html,qch,src}
@@ -1302,6 +1283,9 @@ fi
 
 
 %changelog
+* 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)
+
 * Sat Nov 01 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.8.6-15
 - sync system-clucene patch from qt5-qttools (some QDir::mkpath in QtCLucene)