Accepting request 425341 from KDE:Extra

- Add fix-build-with-older-qt.patch from upstream to make it
  compile with Qt < 5.6, and lower the Qt requirement to 5.2 again
  (as demanded by CMakeLists.txt)

- Add firewalld service file

- Build docs again
- Require at least Qt 5.6

- New upstream version 1.0
  * Trigger custom commands from phone
  * Reply to SMS messages from the desktop
  * Receive desktop notifications on phone
  * TLS encryption

OBS-URL: https://build.opensuse.org/request/show/425341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=2

fix-build-with-older-qt.patch

@@ -0,0 +1,33 @@
+From: Albert Vaca <albertvaka@gmail.com>
+Date: Sun, 28 Aug 2016 09:19:00 +0000
+Subject: Make it compile with Qt < 5.6
+X-Git-Url: http://quickgit.kde.org/?p=kdeconnect-kde.git&a=commitdiff&h=6281b9c232058759b21bf8e60c2f374fb5d42739
+---
+Make it compile with Qt < 5.6
+---
+
+
+--- a/core/pluginloader.cpp
++++ b/core/pluginloader.cpp
+@@ -109,8 +109,18 @@
+         const QSet<QString> pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-SupportedPackageType").toSet();
+         const QSet<QString> pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-OutgoingPackageType").toSet();
+ 
+-        if ((pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty())
+-            || incoming.intersects(pluginOutgoingCapabilities) || outgoing.intersects(pluginIncomingCapabilities)) {
++        bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty());
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
++        bool capabilitiesIntersect = (outgoing.intersects(pluginIncomingCapabilities) || incoming.intersects(pluginOutgoingCapabilities));
++#else
++        QSet<QString> commonIncoming = incoming;
++        commonIncoming.intersect(pluginOutgoingCapabilities);
++        QSet<QString> commonOutgoing = outgoing;
++        commonOutgoing.intersect(pluginIncomingCapabilities);
++        bool capabilitiesIntersect = (!commonIncoming.isEmpty() || !commonOutgoing.isEmpty());
++#endif
++
++        if (capabilitiesIntersect || capabilitiesEmpty) {
+             ret += service.pluginId();
+         } else {
+             qCDebug(KDECONNECT_CORE) << "Not loading plugin" << service.pluginId() <<  "because device doesn't support it";
+

kdeconnect-kde-0.9g.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4033754057bbc993b1d4350959afbe1d17a4f1e56dd60c6df6abca5a321ee1b8
-size 183632

kdeconnect-kde-1.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:207faf0bb8174d15cc0b04ef5eeacb86db21dd941a645dbf3f6c2ac301c7a85d
+size 217672

kdeconnect-kde-firewalld.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>KDE Connect</short>
+  <description>KDE Connect is a project that aims to communicate all your devices.</description>
+  <port protocol="tcp" port="1714-1764"/>
+  <port protocol="udp" port="1714-1764"/>
+</service>

kdeconnect-kde.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Sep  7 10:19:34 UTC 2016 - wbauer@tmo.at
+
+- Add fix-build-with-older-qt.patch from upstream to make it
+  compile with Qt < 5.6, and lower the Qt requirement to 5.2 again
+  (as demanded by CMakeLists.txt)
+
+-------------------------------------------------------------------
+Fri Aug 26 22:28:10 UTC 2016 - herbert@graeber-clan.de
+
+- Add firewalld service file
+
+-------------------------------------------------------------------
+Fri Aug 26 19:26:49 UTC 2016 - fabian@ritter-vogt.de
+
+- Build docs again
+- Require at least Qt 5.6
+
+-------------------------------------------------------------------
+Fri Aug 26 19:14:41 UTC 2016 - lbeltrame@kde.org
+
+- New upstream version 1.0
+  * Trigger custom commands from phone
+  * Reply to SMS messages from the desktop
+  * Receive desktop notifications on phone
+  * TLS encryption 
+
 -------------------------------------------------------------------
 Mon Feb  1 17:30:52 UTC 2016 - hrvoje.senjan@gmail.com
 

kdeconnect-kde.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kdeconnect-kde
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,17 @@
 
 
 Name:           kdeconnect-kde
-Version:        0.9g
+Version:        1.0
-# dirver only needed for this "fixed" version, shouldn't be needed in next release
-%define dirver  0.9
 Release:        0
 Summary:        KDE Android integration
 License:        GPL-2.0+
 Group:          Productivity/Networking/Other
 Url:            https://projects.kde.org/projects/playground/base/kdeconnect-kde
-Source:         http://download.kde.org/unstable/kdeconnect/%{dirver}/src/%{name}-%{version}.tar.xz
+Source:         http://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-%{version}.tar.xz
 Source100:      kdeconnect-kde.SuSEfirewall
+Source101:      kdeconnect-kde-firewalld.xml
+# PATCH-FIX-UPSTREAM fix-build-with-older-qt.patch -- Make it compile with Qt < 5.6
+Patch:          fix-build-with-older-qt.patch
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= 0.0.9
 BuildRequires:  kf5-filesystem
@@ -34,6 +35,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5ConfigWidgets)
 BuildRequires:  cmake(KF5DBusAddons)
 BuildRequires:  cmake(KF5Declarative)
+BuildRequires:  cmake(KF5DocTools)
 BuildRequires:  cmake(KF5I18n)
 BuildRequires:  cmake(KF5IconThemes)
 BuildRequires:  cmake(KF5KCMUtils)
@@ -70,6 +72,7 @@ https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp
 %{lang_package}
 %prep
 %setup -q
+%patch -p1
 
 %build
 %cmake_kf5 -d build
@@ -85,6 +88,8 @@ done
 # susefirewall config file
 install -D -m 0644 %{S:100} \
     %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+install -D -m 0644 %{S:101} \
+    %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
 
 %suse_update_desktop_file %{buildroot}%{_kf5_applicationsdir}/org.kde.kdeconnect.nonplasma.desktop Network RemoteAccess
 
@@ -95,6 +100,9 @@ install -D -m 0644 %{S:100} \
 %defattr(-,root,root)
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%dir %{_libexecdir}/firewalld
+%dir %{_libexecdir}/firewalld/services
+%{_libexecdir}/firewalld/services/%{name}.xml
 %{_kf5_libdir}/libkdeconnect*.so.*
 %{_kf5_plugindir}/
 %{_kf5_applicationsdir}/*.desktop
@@ -111,7 +119,7 @@ install -D -m 0644 %{S:100} \
 %{_kf5_sharedir}/dbus-1/services/org.kde.kdeconnect.service
 %{_kf5_configdir}/autostart/kdeconnectd.desktop
 %{_kf5_iconsdir}/hicolor/*/status/*
-# %{_kf5_htmldir}/en/kdeconnect/
+%{_kf5_htmldir}/en/kdeconnect-kde/
 
 %files lang -f %{name}.lang
 %defattr(-,root,root)