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

Rex Dieter rdieter at fedoraproject.org
Tue Nov 4 00:45:49 UTC 2014


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

    out-of-tree build, use %qmake_qt5

 qt5-qtmultimedia.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec
index 854edf2..4b0df9c 100644
--- a/qt5-qtmultimedia.spec
+++ b/qt5-qtmultimedia.spec
@@ -15,7 +15,7 @@
 Summary: Qt5 - Multimedia support
 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
@@ -83,19 +83,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
 
 ## .prl/.la file love
@@ -166,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