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

Rex Dieter rdieter at fedoraproject.org
Tue Nov 4 01:00:31 UTC 2014


commit 241f3eca73111bb5e30f5908cb684a6615b5b0e2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Nov 3 19:00:48 2014 -0600

    out-of-tree build, use %qmake_qt5

 qt5-qtx11extras.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/qt5-qtx11extras.spec b/qt5-qtx11extras.spec
index 08dffaf..e8f805e 100644
--- a/qt5-qtx11extras.spec
+++ b/qt5-qtx11extras.spec
@@ -6,7 +6,7 @@
 Summary: Qt5 - X11 support library
 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
@@ -25,12 +25,10 @@ The X11 Extras module provides features specific to platforms using X11, e.g.
 Linux and UNIX-like systems including embedded Linux systems that use the X
 Window System.
 
-
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
-
 %description devel
 %{summary}.
 
@@ -38,15 +36,17 @@ Requires: qt5-qtbase-devel%{?_isa}
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
 
-
 %build
-%{_qt5_qmake}
+mkdir %{_target_platform}
+pushd %{_target_platform}
+%{qmake_qt5} ..
 
 make %{?_smp_mflags}
+popd
 
 
 %install
-make install INSTALL_ROOT=%{buildroot}
+make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
@@ -79,6 +79,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