better bootstrap support (examples)
This commit is contained in:
Rex Dieter 2019-02-15 10:20:59 -06:00
parent fcfc7780bf
commit 9390e3f9d6
3 changed files with 25 additions and 11 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/qttools-everywhere-src-5.11.1.tar.xz /qttools-everywhere-src-5.11.1.tar.xz
/qttools-everywhere-src-5.11.2.tar.xz /qttools-everywhere-src-5.11.2.tar.xz
/qttools-everywhere-src-5.11.3.tar.xz /qttools-everywhere-src-5.11.3.tar.xz
/qttools-everywhere-src-5.12.1.tar.xz

View File

@ -9,8 +9,8 @@
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.11.3 Version: 5.12.1
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv3 or LGPLv2 License: LGPLv3 or LGPLv2
Url: http://www.qt.io Url: http://www.qt.io
@ -41,13 +41,17 @@ BuildRequires: qt5-rpm-macros >= %{version}
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtbase-static >= %{version}
# libQt5DBus.so.5(Qt_5_PRIVATE_API)
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%if ! 0%{?bootstrap}
# for qdoc
BuildRequires: clang-devel llvm-devel
BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version}
BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Qml)
# libQt5DBus.so.5(Qt_5_PRIVATE_API)
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%if 0%{?bootstrap}
Obsoletes: %{name}-examples < %{version}-%{release}
%else
%global no_examples CONFIG-=compile_examples
# for qdoc
BuildRequires: clang-devel llvm-devel
%endif %endif
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
@ -169,7 +173,8 @@ Requires: %{name}-common = %{version}-%{release}
%build %build
%{qmake_qt5} %{qmake_qt5} \
%{?no_examples}
%make_build %make_build
@ -320,7 +325,9 @@ fi
%files -n qt5-doctools %files -n qt5-doctools
%{_bindir}/qdoc* %{_bindir}/qdoc*
%{_qt5_bindir}/qdoc* %{_qt5_bindir}/qdoc*
%{_bindir}/qdistancefieldgenerator*
%{_bindir}/qhelpgenerator* %{_bindir}/qhelpgenerator*
%{_qt5_bindir}/qdistancefieldgenerator*
%{_qt5_bindir}/qhelpgenerator* %{_qt5_bindir}/qhelpgenerator*
%{_bindir}/qtattributionsscanner-qt5 %{_bindir}/qtattributionsscanner-qt5
%{_qt5_bindir}/qtattributionsscanner* %{_qt5_bindir}/qtattributionsscanner*
@ -409,13 +416,13 @@ fi
%files devel %files devel
%{_bindir}/pixeltool* %{_bindir}/pixeltool*
%{_bindir}/qcollectiongenerator* %{_bindir}/qcollectiongenerator*
%{_bindir}/qhelpconverter* #{_bindir}/qhelpconverter*
%{_bindir}/qtdiag* %{_bindir}/qtdiag*
%{_bindir}/qtplugininfo* %{_bindir}/qtplugininfo*
%{_qt5_bindir}/pixeltool* %{_qt5_bindir}/pixeltool*
%{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qtdiag*
%{_qt5_bindir}/qcollectiongenerator* %{_qt5_bindir}/qcollectiongenerator*
%{_qt5_bindir}/qhelpconverter* #{_qt5_bindir}/qhelpconverter*
%{_qt5_bindir}/qtplugininfo* %{_qt5_bindir}/qtplugininfo*
%{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesigner/
%{_qt5_headerdir}/QtDesignerComponents/ %{_qt5_headerdir}/QtDesignerComponents/
@ -447,14 +454,20 @@ fi
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
%if ! 0%{?no_examples:1}
%files examples %files examples
%{_qt5_examplesdir}/ %{_qt5_examplesdir}/
%{_qt5_plugindir}/designer/* %{_qt5_plugindir}/designer/*
%dir %{_qt5_libdir}/cmake/Qt5Designer %dir %{_qt5_libdir}/cmake/Qt5Designer
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_* %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
%endif
%changelog %changelog
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
- 5.12.1
- better bootstrap support (examples)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (qttools-everywhere-src-5.11.3.tar.xz) = f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf SHA512 (qttools-everywhere-src-5.12.1.tar.xz) = e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e