5.9.6

macros.kf5: provide %qmake_qt5_wrapper macro for real
5.9.4
2018-06-11 15:25:27 -05:00 · 2018-01-24 16:46:24 -06:00 · 2018-01-24 15:55:49 -06:00
3 changed files with 31 additions and 1 deletions
--- a/macros.qt5
+++ b/macros.qt5
@ -31,3 +31,5 @@
  QMAKE_STRIP=

 %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
+
+%qmake_qt5_wrapper %{_bindir}/qmake-qt5.sh
--- a/qmake-qt5.sh
+++ b/qmake-qt5.sh
@ -0,0 +1,10 @@
+#!/bin/sh
+
+# An attempt at providing a qmake wrapper for projects that
+# lack native qmake support (ie, qmake is run by buildsystem
+# instead of developer or fedora packager).
+
+QMAKE="$(rpm --eval %{_qt5_qmake})"
+QMAKE_FLAGS="$(rpm --eval %{?_qt5_qmake_flags})"
+
+eval $QMAKE $QMAKE_FLAGS $@
--- a/qt5.spec
+++ b/qt5.spec
@ -1,12 +1,13 @@

 Name: qt5
-Version: 5.9.3
+Version: 5.9.6
 Release: 1%{?dist}
 Summary: Qt5 meta package
 License: GPLv3
 URL: https://getfedora.org/
 Source0: macros.qt5
 Source1: macros.qt5-srpm
+Source2: qmake-qt5.sh
 BuildArch: noarch

 Requires: qt5-qdbusviewer
@ -96,6 +97,10 @@ Summary: RPM macros for source Qt5 packages
 %install
 install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
 install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm
+install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt5.sh
+mkdir -p %{buildroot}%{_datadir}/qt5/wrappers
+ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake
+ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake-qt5

 # substitute custom flags
 sed -i \
@ -118,12 +123,25 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README

 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.qt5
+%{_bindir}/qmake-qt5.sh
+%dir %{_datadir}/qt5
+%{_datadir}/qt5/wrappers/

 %files srpm-macros
 %{_rpmconfigdir}/macros.d/macros.qt5-srpm


 %changelog
+* Mon Jun 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.6-1
+- 5.9.6
+
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-2
+- macros.kf5: provide %%qmake_qt5_wrapper macro for real
+
+* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
+- 5.9.4
+- provide qmake-qt5.sh wrapper and new macro: %%qmake_qt5_wrapper
+
 * Wed Jan 03 2018 Rex Dieter <rdieter@fedoraproject.org> 5.9.3-1
 - 5.9.3
Author	SHA1	Message	Date
Rex Dieter	9cc9b9b8b8	5.9.6	2018-06-11 15:25:27 -05:00
Rex Dieter	de0ad24b4e	macros.kf5: provide %qmake_qt5_wrapper macro for real	2018-01-24 16:46:24 -06:00
Rex Dieter	9146cbbd96	5.9.4 provide qmake-qt5.sh wrapper and new macro: %qmake_qt5_wrapper	2018-01-24 15:55:49 -06:00