out-of-tree build, use %qmake_qt5

This commit is contained in:
Rex Dieter 2014-11-03 18:55:15 -06:00
parent c63ded3c4c
commit e7d0eeadda

View File

@ -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 <rdieter@fedoraproject.org> 5.4.0-0.7.beta
- out-of-tree build, use %%qmake_qt5
* Fri Oct 31 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.6.beta
- respin system-clucene.patch