From 1fcfee38a9313018a1a0645e22964147f6f6d63c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 19 Jul 2016 06:31:27 -0500
Subject: [PATCH] introduce macros.qt5-qtbase (for %_qt5, %_qt5_epoch,
 %_qt5_version, %_qt5_evr)

---
 macros.qt5-qtbase |  4 ++++
 qt5-qtbase.spec   | 27 ++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 macros.qt5-qtbase

diff --git a/macros.qt5-qtbase b/macros.qt5-qtbase
new file mode 100644
index 0000000..836471f
--- /dev/null
+++ b/macros.qt5-qtbase
@@ -0,0 +1,4 @@
+%_qt5 @@NAME@@
+%_qt5_epoch @@EPOCH@@
+%_qt5_version @@VERSION@@
+%_qt5_evr @@EVR@@
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 07940f3..af536c5 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -21,6 +21,8 @@
 
 %global qt_module qtbase
 
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
 ## set to 1 to enable bootstrap
 %global bootstrap 0
 
@@ -60,7 +62,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
 Version: 5.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -78,6 +80,9 @@ Source5: qconfig-multilib.h
 # QT_XCB_FORCE_SOFTWARE_OPENGL for them
 Source6: 10-qt5-check-opengl2.sh
 
+# macros
+Source10: macros.qt5-qtbase
+
 # support multilib optflags
 Patch2: qtbase-multilib_optflags.patch
 
@@ -487,9 +492,19 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: 5.6.0
+Version: %{version}
 EOF
 
+# rpm macros
+install -p -m644 -D %{SOURCE10} \
+  %{buildroot}%{rpm_macros_dir}/macros.qt5
+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.qt5-qtbase
+
 # create/own dirs
 mkdir -p %{buildroot}{%{_qt5_archdatadir}/mkspecs/modules,%{_qt5_importdir},%{_qt5_libexecdir},%{_qt5_plugindir}/{designer,iconengines,script,styles},%{_qt5_translationdir}}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject
@@ -665,7 +680,8 @@ fi
 %{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
 
 %files common
-# empty for now, consider: filesystem/dir ownership, licenses
+# mostly empty for now, consider: filesystem/dir ownership, licenses
+%{rpm_macros_dir}/macros.qt5-qtbase
 
 %if 0%{?docs}
 %files doc
@@ -903,9 +919,10 @@ fi
 %{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
 
 
-
-
 %changelog
+* Tue Jul 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-3
+- introduce macros.qt5-qtbase (for %%_qt5, %%_qt5_epoch, %%_qt5_version, %%_qt5_evr)
+
 * Tue Jun 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
 - Compiled with gcc