From 6debab742bd031322a34f3ba56ab45b4e9b48833 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Mar 2016 12:13:24 -0500 Subject: [PATCH] restore bootstrap support --- qt5-qttools.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 91f0125..beecb2f 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -6,9 +6,11 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap +%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif +%endif #define prerelease @@ -42,11 +44,15 @@ Source23: qdbusviewer.desktop %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: cmake %endif +BuildRequires: desktop-file-utils BuildRequires: pkgconfig(Qt5) >= %{version} +## optional (and deprecated), include in bootstrapping only for now +%if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5WebKit) +%global webkit 1 +%endif BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtdeclarative-static >= %{version} -BuildRequires: desktop-file-utils %if 0%{?system_clucene} BuildRequires: clucene09-core-devel >= 0.9.21b-12 @@ -363,9 +369,11 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake +%if 0%{?webkit} %files -n qt5-designer-plugin-webkit %{_qt5_plugindir}/designer/libqwebview.so %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%endif %post -n qt5-linguist touch --no-create %{_datadir}/icons/hicolor ||: