From 24b12bdd5b1e95907e1980da2f6b143bf8ebbddb Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Sun, 26 Mar 2017 19:00:46 +0200
Subject: [PATCH] Update to 5.8.0

- New upstream version
---
 .gitignore             |  1 +
 qt5-qtdeclarative.spec | 28 ++++++++--------------------
 sources                |  2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3354caa..06e7db8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /qtdeclarative-opensource-src-5.6.1.tar.xz
 /qtdeclarative-opensource-src-5.7.0.tar.xz
 /qtdeclarative-opensource-src-5.7.1.tar.xz
+/qtdeclarative-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index f9ea376..9ac7abc 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -1,15 +1,8 @@
 %global qt_module qtdeclarative
 
-# 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
-#global bootstrap 1
-
-%if ! 0%{?bootstrap}
+# To build without qttools doctools package, just undefine docs
 %ifarch %{arm} %{ix86} x86_64
 %global docs 1
-#global tests 1
-%endif
 %endif
 
 %ifarch %{ix86}
@@ -21,8 +14,8 @@
 
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
-Release: 7%{?dist}
+Version: 5.8.0
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -52,10 +45,7 @@ Obsoletes: qt5-qtjsbackend < 5.2.0
 
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-private-devel
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-%if ! 0%{?bootstrap}
 BuildRequires: qt5-qtxmlpatterns-devel
-%endif
 BuildRequires: python
 
 %if 0%{?tests}
@@ -84,17 +74,15 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %{summary}.
 
-%if 0%{?docs}
 %package doc
 Summary: API documentation for %{name}
 License: GFDL
 Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
+BuildRequires: qt5-doctools
+BuildRequires: qt5-qtbase-doc
 BuildArch: noarch
 %description doc
 %{summary}.
-%endif
 
 %package examples
 Summary: Programming examples for %{name}
@@ -242,15 +230,15 @@ make check -k -C %{_target_platform}/tests ||:
 %{_qt5_docdir}/qtqml/
 %{_qt5_docdir}/qtquick.qch
 %{_qt5_docdir}/qtquick/
-%endif
 
 %files examples
 %{_qt5_examplesdir}/
+%endif
 
 
 %changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream version
 
 * Mon Jan 02 2017 Rex Dieter <rdieter@math.unl.edu> - 5.7.1-6
 - filter qml provides
diff --git a/sources b/sources
index de71fb3..8d000f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdeclarative-opensource-src-5.7.1.tar.xz) = 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
+SHA512 (qtdeclarative-opensource-src-5.8.0.tar.xz) = 5f3b2d03778cff29ea573ac6bee149892da4d26c7154e4ea3756ac782d7db5a3a5cb733d3285351f50f97bda9366c60f38c88c00fff2deaa7856e63a080937fc