use %make_build
This commit is contained in:
Rex Dieter 2018-05-27 12:07:14 -05:00
parent c394dfe1ba
commit 5f37aa0fa5
3 changed files with 15 additions and 10 deletions

5
.gitignore vendored
View File

@ -1,5 +1,2 @@
/qttools-opensource-src-5.9.1.tar.xz
/qttools-opensource-src-5.9.2.tar.xz
/qttools-opensource-src-5.9.3.tar.xz
/qttools-everywhere-src-5.10.0.tar.xz
/qttools-everywhere-src-5.10.1.tar.xz /qttools-everywhere-src-5.10.1.tar.xz
/qttools-everywhere-src-5.11.0.tar.xz

View File

@ -9,12 +9,13 @@
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.10.1 Version: 5.11.0
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv3 or LGPLv2 License: LGPLv3 or LGPLv2
Url: http://www.qt.io Url: http://www.qt.io
Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
# help lrelease/lupdate use/prefer qmake-qt5 # help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@ -170,10 +171,11 @@ Requires: %{name}-common = %{version}-%{release}
%patch4 -p1 -b .libatomic %patch4 -p1 -b .libatomic
%endif %endif
%build %build
%{qmake_qt5} %{qmake_qt5}
make %{?_smp_mflags} %make_build
%install %install
@ -270,15 +272,18 @@ popd
%license LICENSE.LGPL* %license LICENSE.LGPL*
%ldconfig_scriptlets libs-designer %ldconfig_scriptlets libs-designer
%files libs-designer %files libs-designer
%{_qt5_libdir}/libQt5Designer.so.5* %{_qt5_libdir}/libQt5Designer.so.5*
%dir %{_qt5_libdir}/cmake/Qt5Designer/ %dir %{_qt5_libdir}/cmake/Qt5Designer/
%ldconfig_scriptlets libs-designercomponents %ldconfig_scriptlets libs-designercomponents
%files libs-designercomponents %files libs-designercomponents
%{_qt5_libdir}/libQt5DesignerComponents.so.5* %{_qt5_libdir}/libQt5DesignerComponents.so.5*
%ldconfig_scriptlets libs-help %ldconfig_scriptlets libs-help
%files libs-help %files libs-help
%{_qt5_libdir}/libQt5Help.so.5* %{_qt5_libdir}/libQt5Help.so.5*
@ -405,7 +410,6 @@ fi
%{_datadir}/applications/*qdbusviewer.desktop %{_datadir}/applications/*qdbusviewer.desktop
%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.* %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
%files devel %files devel
%{_bindir}/pixeltool* %{_bindir}/pixeltool*
%{_bindir}/qcollectiongenerator* %{_bindir}/qcollectiongenerator*
@ -455,6 +459,10 @@ fi
%changelog %changelog
* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
- 5.11.0
- use %%make_build
* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2 * Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
- BR: qt5-rpm-macros - BR: qt5-rpm-macros

View File

@ -1 +1 @@
SHA512 (qttools-everywhere-src-5.10.1.tar.xz) = ecc20048a94e8077c2254fc65d126f69aadd94ceb7a3728b4fbd56d7e6296d1f2a1911777849bce4fab3769da1d2f780d66b3c3f19e16e0618ff569d116f7f91 SHA512 (qttools-everywhere-src-5.11.0.tar.xz) = d63f0a5f2c48951c12f5895a5e954e7c9166543ff230d831a2607a3d9f0a053fdec5f34d73e6309e053fc194fca18af2540974f7f585e6bb5814ba779cc21d8b