From 69596421121a7e51ddb8d43de6e30a51b4849f16 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:36:54 +0000
Subject: import qt5-qttools-5.6.2-1.el7


---

diff --git a/.gitignore b/.gitignore
index 201c3b9..25d58fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qttools-opensource-src-5.6.1.tar.xz
+SOURCES/qttools-opensource-src-5.6.2.tar.xz
diff --git a/.qt5-qttools.metadata b/.qt5-qttools.metadata
index a5b4eff..734e8df 100644
--- a/.qt5-qttools.metadata
+++ b/.qt5-qttools.metadata
@@ -1 +1 @@
-72fe3ac2011de96af0ce32589f43a4ef96886b31 SOURCES/qttools-opensource-src-5.6.1.tar.xz
+549e17f98e0a5a8290d2e55cda1b0dd5fe4b688f SOURCES/qttools-opensource-src-5.6.2.tar.xz
diff --git a/SOURCES/qttools-opensource-src-5.6-QTBUG-43057.patch b/SOURCES/qttools-opensource-src-5.6-QTBUG-43057.patch
index 71ed24c..d9ef7e0 100644
--- a/SOURCES/qttools-opensource-src-5.6-QTBUG-43057.patch
+++ b/SOURCES/qttools-opensource-src-5.6-QTBUG-43057.patch
@@ -1,12 +1,12 @@
-diff -up qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp
---- qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig	2015-12-14 10:58:18.000000000 -0600
-+++ qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp	2016-01-17 20:42:45.946004310 -0600
-@@ -1531,7 +1531,7 @@ void QDocIndexFiles::generateIndexSectio
+diff -up qttools-opensource-src-5.6.2/src/qdoc/qdocindexfiles.cpp.QTBUG-43057 qttools-opensource-src-5.6.2/src/qdoc/qdocindexfiles.cpp
+--- qttools-opensource-src-5.6.2/src/qdoc/qdocindexfiles.cpp.QTBUG-43057	2016-11-03 09:19:59.257547541 -0500
++++ qttools-opensource-src-5.6.2/src/qdoc/qdocindexfiles.cpp	2016-11-03 09:21:39.574157002 -0500
+@@ -1412,7 +1412,7 @@ void QDocIndexFiles::generateIndexSectio
              const Aggregate* inner = static_cast<const Aggregate*>(node);
  
              NodeList cnodes = inner->childNodes();
--            std::sort(cnodes.begin(), cnodes.end(), compareNodes);
-+            qSort(cnodes.begin(), cnodes.end(), compareNodes);
+-            std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan);
++            qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan);
  
              foreach (Node* child, cnodes) {
                  generateIndexSections(writer, child, generateInternalNodes);
diff --git a/SPECS/qt5-qttools.spec b/SPECS/qt5-qttools.spec
index de31e04..86b066d 100644
--- a/SPECS/qt5-qttools.spec
+++ b/SPECS/qt5-qttools.spec
@@ -14,16 +14,14 @@
 %endif
 %endif
 
-#define prerelease
-
 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.6.1
-Release: 10%{?prerelease:.%{prerelease}}%{?dist}
+Version: 5.6.2
+Release: 1%{?dist}
 
 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
-Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
+Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
 
@@ -274,7 +272,7 @@ export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
 export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
 mkdir tests/auto/cmake/%{_target_platform}
 pushd tests/auto/cmake/%{_target_platform}
-cmake ..
+cmake .. ||:
 ctest --output-on-failure ||:
 popd
 %endif
@@ -445,7 +443,13 @@ fi
 %{_qt5_libdir}/cmake/Qt5UiPlugin/
 %{_qt5_libdir}/pkgconfig/Qt5Designer.pc
 %{_qt5_libdir}/pkgconfig/Qt5Help.pc
-%{_qt5_archdatadir}/mkspecs/modules/*.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_clucene_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
 
 %files static
 %{_qt5_headerdir}/QtUiTools/
@@ -453,6 +457,8 @@ fi
 %{_qt5_libdir}/libQt5UiTools.prl
 %{_qt5_libdir}/cmake/Qt5UiTools/
 %{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
+%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
 
 %if 0%{?docs}
 %files doc
@@ -476,6 +482,10 @@ fi
 
 
 %changelog
+* Wed Jan 11 2017 Jan Grulich <jgrulich@redhat.com> - 5.6.2-1
+- Update to 5.6.2
+  Resolves: bz#1384836
+
 * Tue Aug 30 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-10
 - Increase build version to have newer version than in EPEL
   Resolves: bz#1317413