[qt5-qtquick1] out-of-tree build, use %qmake_qt5

Rex Dieter rdieter at fedoraproject.org
Tue Nov 4 00:46:39 UTC 2014


commit f9d0c3069c560456ca9373b99ef6dd5af9742d3d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 3 18:46:52 2014 -0600

    out-of-tree build, use %qmake_qt5

 qt5-qtquick1.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/qt5-qtquick1.spec b/qt5-qtquick1.spec
index f3267ce..21f0943 100644
--- a/qt5-qtquick1.spec
+++ b/qt5-qtquick1.spec
@@ -10,7 +10,7 @@
 Summary: A declarative language for describing user interfaces in Qt5
 Name:    qt5-%{qt_module}
 Version: 5.4.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -74,20 +74,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %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
 
 # hardlink files to %{_bindir}, add -qt5 postfix to not conflict
@@ -167,6 +170,9 @@ popd
 
 
 %changelog
+* Mon Nov 03 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.2.beta
+- out-of-tree build, use %%qmake_qt5
+
 * Sun Oct 19 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
 - 5.4.0-beta
 


More information about the scm-commits mailing list