From bff086e5356451ec4bb81a881734c4754549de15 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Thu, 10 Dec 2015 21:40:00 +0100
Subject: [PATCH] - Update to final official beta

---
 .gitignore       |  1 +
 qt5-qttools.spec | 45 ++++++++++++++++++++++++++++-----------------
 sources          |  2 +-
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad0b49e..26644cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /qttools-opensource-src-5.5.0.tar.xz
 /qttools-opensource-src-5.5.1-rc1.tar.xz
 /qttools-opensource-src-5.5.1.tar.xz
+/qttools-opensource-src-5.6.0-beta.tar.gz
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index ba84d16..bb4eee7 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -6,25 +6,18 @@
 %global system_clucene 1
 %endif
 
-# 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 rc1
+%define prerelease beta
 
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.5.1
-Release: 2%{?dist}
+Version: 5.6.0
+Release: 0.2%{?dist}
 
 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
-Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
+Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz
 
 Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
 
@@ -47,7 +40,9 @@ BuildRequires: desktop-file-utils
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-static >= %{version}
 BuildRequires: qt5-qtdeclarative-static >= %{version}
-BuildRequires: qt5-qtwebkit-devel
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: qt5-qdoc
+BuildRequires: qt5-qhelpgenerator
 
 %if 0%{?system_clucene}
 BuildRequires: clucene09-core-devel >= 0.9.21b-12
@@ -160,11 +155,19 @@ Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
 %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 %description -n qt5-qhelpgenerator
 
+%package -n qt5-qdoc
+Summary: Qt5 documentation generator 
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description -n qt5-qdoc
+%{summary}.
+
 %if 0%{?docs}
 %package doc
 Summary: API documentation for %{name}
 BuildRequires: qt5-qhelpgenerator
 BuildArch: noarch
+Conflicts: qt5-qtbase-doc < 5.6.0
+
 %description doc
 %{summary}.
 %endif
@@ -335,10 +338,6 @@ fi
 %{_datadir}/applications/*designer.desktop
 %{_datadir}/icons/hicolor/*/apps/designer*.*
 # example designer plugins
-%{_qt5_plugindir}/designer/libcontainerextension.so
-%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
-%{_qt5_plugindir}/designer/libtaskmenuextension.so
-%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
 %{_qt5_plugindir}/designer/libqquickwidget.so
 %dir %{_qt5_libdir}/cmake/Qt5Designer/
 %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
@@ -401,6 +400,10 @@ fi
 %{_datadir}/applications/*qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
 
+%files -n qt5-qdoc
+%{_bindir}/qdoc*
+%{_qt5_bindir}/qdoc*
+
 %files -n qt5-qhelpgenerator
 %{_bindir}/qhelpgenerator*
 %{_qt5_bindir}/qhelpgenerator*
@@ -446,7 +449,7 @@ fi
 
 %if 0%{?docs}
 %files doc
-%doc LICENSE.FDL
+%license LICENSE.FDL
 %{_qt5_docdir}/qtassistant.qch
 %{_qt5_docdir}/qtassistant/
 %{_qt5_docdir}/qtdesigner.qch
@@ -457,6 +460,8 @@ fi
 %{_qt5_docdir}/qtlinguist/
 %{_qt5_docdir}/qtuitools.qch
 %{_qt5_docdir}/qtuitools/
+%{_qt5_docdir}/qdoc.qch
+%{_qt5_docdir}/qdoc/
 %endif
 
 %if 0%{?_qt5_examplesdir:1}
@@ -466,6 +471,12 @@ fi
 
 
 %changelog
+* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2
+- Official beta release
+
+* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
+- Start to implement 5.6.0 beta
+
 * Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
 - Update to final release 5.5.1
 
diff --git a/sources b/sources
index 830fa37..c0f9d39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-535ff9df9d83e9bde08ee3913b751d07  qttools-opensource-src-5.5.1.tar.xz
+19de3f78d0d92a2a92c3abbc8ee27393  qttools-opensource-src-5.6.0-beta.tar.gz