From 08ca3979324eca1a11eb9a3c30f1dc2fef8fe942 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:33:44 +0000
Subject: import qt5-qtconnectivity-5.6.2-1.el7


---

diff --git a/.gitignore b/.gitignore
index 3ebb6c6..ee0f8f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qtconnectivity-opensource-src-5.6.1.tar.xz
+SOURCES/qtconnectivity-opensource-src-5.6.2.tar.xz
diff --git a/.qt5-qtconnectivity.metadata b/.qt5-qtconnectivity.metadata
index 69d74f3..50ae659 100644
--- a/.qt5-qtconnectivity.metadata
+++ b/.qt5-qtconnectivity.metadata
@@ -1 +1 @@
-07fba0a67064338f7fe76783cf3fd785594f77f1 SOURCES/qtconnectivity-opensource-src-5.6.1.tar.xz
+899e3c14ac203ff01f0f05cae7834957d70d338b SOURCES/qtconnectivity-opensource-src-5.6.2.tar.xz
diff --git a/SOURCES/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch b/SOURCES/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch
new file mode 100644
index 0000000..ffd70a9
--- /dev/null
+++ b/SOURCES/qtconnectivity-opensource-src-5.6.1-bluez_el6.patch
@@ -0,0 +1,25 @@
+diff -up qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6 qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp
+--- qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6	2016-05-23 00:58:18.000000000 -0500
++++ qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp	2016-06-15 13:38:51.302319277 -0500
+@@ -32,8 +32,8 @@
+ ****************************************************************************/
+ 
+ #include "qlowenergycontroller_p.h"
+-#ifndef QT_IOS_BLUETOOTH
+-#include "dummy/dummy_helper_p.h"
++#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH)
++//#include "dummy/dummy_helper_p.h"
+ #endif
+ 
+ QT_BEGIN_NAMESPACE
+@@ -43,8 +43,8 @@ QLowEnergyControllerPrivate::QLowEnergyC
+       state(QLowEnergyController::UnconnectedState),
+       error(QLowEnergyController::NoError)
+ {
+-#ifndef QT_IOS_BLUETOOTH
+-    printDummyWarning();
++#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH)
++//    printDummyWarning();
+ #endif
+     registerQLowEnergyControllerMetaType();
+ }
diff --git a/SOURCES/qtconnectivity-opensource-src-5.6.2-arpa_inet.patch b/SOURCES/qtconnectivity-opensource-src-5.6.2-arpa_inet.patch
new file mode 100644
index 0000000..98b151a
--- /dev/null
+++ b/SOURCES/qtconnectivity-opensource-src-5.6.2-arpa_inet.patch
@@ -0,0 +1,11 @@
+diff -up qtconnectivity-opensource-src-5.6.2/src/tools/sdpscanner/main.cpp.htonl qtconnectivity-opensource-src-5.6.2/src/tools/sdpscanner/main.cpp
+--- qtconnectivity-opensource-src-5.6.2/src/tools/sdpscanner/main.cpp.htonl	2016-09-12 04:45:32.000000000 -0500
++++ qtconnectivity-opensource-src-5.6.2/src/tools/sdpscanner/main.cpp	2016-11-04 08:05:39.854356383 -0500
+@@ -33,6 +33,7 @@
+ 
+ #include <QtCore/QByteArray>
+ #include <QtCore/QDebug>
++#include <arpa/inet.h>
+ #include <stdio.h>
+ #include <string>
+ #include <bluetooth/bluetooth.h>
diff --git a/SPECS/qt5-qtconnectivity.spec b/SPECS/qt5-qtconnectivity.spec
index 4efb57d..76e217a 100644
--- a/SPECS/qt5-qtconnectivity.spec
+++ b/SPECS/qt5-qtconnectivity.spec
@@ -3,26 +3,28 @@
 
 %define docs 1
 
-#define prerelease
-
 Summary: Qt5 - Connectivity components
 Name:    qt5-%{qt_module}
-Version: 5.6.1
-Release: 10%{?prerelease:.%{prerelease}}%{?dist}
+Version: 5.6.2
+Release: 1%{?dist}
 
 # See LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
-Url:     http://qt.io
-Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
+Url:     http://www.qt.io
+Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 ## upstreamable patches
 # bswap_16 apparently missing on el6/ppc64
 Patch50: qtconnectivity-opensource-src-5.4.0-bswap_16.patch
+# NEEDSWORK, fix FTBFS on rhel6
+Patch51: qtconnectivity-opensource-src-5.6.1-bluez_el6.patch
+# htonl undefined, include arpa/inet.h
+Patch52: qtconnectivity-opensource-src-5.6.2-arpa_inet.patch
 
 BuildRequires: cmake
 BuildRequires: qt5-qtbase-devel >= %{version}
+BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: pkgconfig(bluez)
-BuildRequires: pkgconfig(Qt5Quick)
 
 %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 
@@ -55,9 +57,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
+%setup -q -n %{qt_module}-opensource-src-%{version}
 %patch50 -p1 -b .bswap_16
-
+%if 0%{?rhel} == 6
+%patch51 -p1 -b .bluez_el6
+%endif
+%patch52 -p1 -b .arpa_inet
 
 %build
 mkdir %{_target_platform}
@@ -148,6 +153,10 @@ popd
 
 
 %changelog
+* Wed Jan 11 2017 Jan Grulich <jgrulich@redhat.com> - 5.6.2-1
+- Update to 5.6.2
+  Resolves: bz#1384816
+
 * 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#1317399