From 2b14aad0382cf87e85168f679d85200439b862f8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 2 May 2015 10:33:47 -0500 Subject: [PATCH] Revert "drop bootstrap (#1211203)" This reverts commit f243c5b7858dc75934ee29003930a075744796e8. Build is still failing (doc generation segfaults), will retry after gcc5 mass rebuild. --- qt5-qtbase.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 340b299..a209f1e 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -15,7 +15,9 @@ %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -#global bootstrap 1 +%if 0%{?fedora} > 22 +%global bootstrap 1 +%endif # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -898,7 +900,6 @@ fi * Fri May 01 2015 Rex Dieter - 5.4.1-12 - backport a couple more upstream fixes - introduce -common noarch subpkg, should help multilib issues -- drop bootstrap (#1211203) * Sat Apr 25 2015 Rex Dieter 5.4.1-11 - port qtdbusconnection_no_debug.patch from qt(4)