From e7d0eeaddaa35235b328912b61b69266fcfc31e3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Nov 2014 18:55:15 -0600 Subject: [PATCH] out-of-tree build, use %qmake_qt5 --- qt5-qttools.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 939b455..5bf433a 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.4.0 -Release: 0.6.%{pre}%{?dist} +Release: 0.7.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -172,20 +172,23 @@ rm -rf src/assistant/3rdparty/clucene %build -%{_qt5_qmake} +mkdir %{_target_platform} +pushd %{_target_platform} +%{qmake_qt5} .. make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs %endif +popd %install -make install INSTALL_ROOT=%{buildroot} +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} +make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %endif # Add desktop files, --vendor=qt4 helps avoid possible conflicts with qt3/qt4 @@ -423,6 +426,9 @@ fi %changelog +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.7.beta +- out-of-tree build, use %%qmake_qt5 + * Fri Oct 31 2014 Rex Dieter 5.4.0-0.6.beta - respin system-clucene.patch