From 9f47857591eaefecebd637978721295b2dd3f371554a20b80c7cb8a6e1eac4b8 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Fri, 29 Jan 2021 11:29:07 +0000
Subject: [PATCH] Accepting request 867696 from home:ecsos

Update to 3.1.2

OBS-URL: https://build.opensuse.org/request/show/867696
OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=32
---
 nextcloud-desktop-3.1.1.tar.gz |  3 ---
 nextcloud-desktop-3.1.2.tar.gz |  3 +++
 nextcloud-desktop.changes      | 11 +++++++++++
 nextcloud-desktop.spec         | 10 +++++++---
 4 files changed, 21 insertions(+), 6 deletions(-)
 delete mode 100644 nextcloud-desktop-3.1.1.tar.gz
 create mode 100644 nextcloud-desktop-3.1.2.tar.gz

diff --git a/nextcloud-desktop-3.1.1.tar.gz b/nextcloud-desktop-3.1.1.tar.gz
deleted file mode 100644
index d405dc9..0000000
--- a/nextcloud-desktop-3.1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e296156a4de033a59f9b3210fe17fdfb8bb7aebefb715ae4e3b85e627e40a87f
-size 19440799
diff --git a/nextcloud-desktop-3.1.2.tar.gz b/nextcloud-desktop-3.1.2.tar.gz
new file mode 100644
index 0000000..b552bb3
--- /dev/null
+++ b/nextcloud-desktop-3.1.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189
+size 19517295
diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes
index 7e9f935..68c31a0 100644
--- a/nextcloud-desktop.changes
+++ b/nextcloud-desktop.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jan 28 17:31:58 UTC 2021 - ecsos <ecsos@opensuse.org>
+
+- Update to 3.1.2
+  - desktop#2846 [stable-3.1] Handle SVG branded clients
+  - desktop#2849 [stable-3.1] Default to colored systray on linux
+  - desktop#2866 [stable-3.1] Add push notifications for file changes
+  - desktop#2871 [stable-3.1] Start file conflict resolve dialog asynchronous
+  - desktop#2878 [stable-3.1] Use push notifications for Tray activities/notifications fetch trigger.
+  - desktop#2880 Bump release to 3.1.2
+
 -------------------------------------------------------------------
 Wed Dec 23 09:44:24 UTC 2020 - ecsos <ecsos@opensuse.org>
 
diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec
index b6462d6..f0b9ef5 100644
--- a/nextcloud-desktop.spec
+++ b/nextcloud-desktop.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nextcloud-desktop
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define soname  libnextcloudsync
 %define sover   0
 Name:           nextcloud-desktop
-Version:        3.1.1
+Version:        3.1.2
 Release:        0
 Summary:        Nextcloud desktop synchronisation client
 License:        GPL-2.0-or-later AND LGPL-3.0-or-later
@@ -33,6 +33,7 @@ Patch0:         nextcloud-desktop-fix-rpath.patch
 Patch1:         nextcloud-desktop-remove-datetime.patch
 BuildRequires:  AppStream
 BuildRequires:  cmake >= 3.2
+BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel
@@ -43,6 +44,8 @@ BuildRequires:  libqt5-linguist-devel
 BuildRequires:  pkgconfig
 BuildRequires:  qtkeychain-qt5-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(Qt5Keychain)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core) >= 5.12
@@ -55,6 +58,7 @@ BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
 BuildRequires:  pkgconfig(Qt5WebKitWidgets)
+BuildRequires:  pkgconfig(Qt5WebSockets)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(cloudproviders)
 BuildRequires:  pkgconfig(dbus-1)
@@ -70,7 +74,6 @@ Provides:       nextcloud-client-lang = %{version}
 Obsoletes:      nextcloud-client-lang < %{version}
 %if 0%{?is_opensuse}
 BuildRequires:  doxygen
-BuildRequires:  kio-devel
 BuildRequires:  python3-Sphinx
 Suggests:       %{name}-doc = %{version}
 %endif
@@ -180,6 +183,7 @@ cp -a %{SOURCE1} sysctl-sync-inotify.conf
 %cmake \
 %if 0%{?is_opensuse}
   -DWITH_DOC=ON          \
+  -DNO_SHIBBOLETH=1 \
 %endif
   -DCMAKE_SKIP_RPATH=OFF
 %cmake_build