From 05f9b609e726eeb0bcf5ab46b6d04899b35715ed362c098c38bfee04075306a0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 9 Jun 2020 22:47:51 +0000
Subject: [PATCH] Accepting request 812721 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/812721
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=114
---
 ktorrent-5.1.2.tar.xz |  3 ---
 ktorrent-5.2.0.tar.xz |  3 +++
 ktorrent.1            | 20 +++++++++++++-------
 ktorrent.changes      | 15 +++++++++++++++
 ktorrent.spec         | 16 ++++++++--------
 ktupnptest.1          | 11 +++++++----
 6 files changed, 46 insertions(+), 22 deletions(-)
 delete mode 100644 ktorrent-5.1.2.tar.xz
 create mode 100644 ktorrent-5.2.0.tar.xz

diff --git a/ktorrent-5.1.2.tar.xz b/ktorrent-5.1.2.tar.xz
deleted file mode 100644
index 6adc662..0000000
--- a/ktorrent-5.1.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:641427a3d6ecb18b0b28c1cc2ec3ba54612abf684df5e10e6c953cd7af058d4f
-size 2048604
diff --git a/ktorrent-5.2.0.tar.xz b/ktorrent-5.2.0.tar.xz
new file mode 100644
index 0000000..b8172cf
--- /dev/null
+++ b/ktorrent-5.2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1031d745c1ace02d11b59c426610aee779d208e3d1ae81f8559c265173732ff
+size 2056012
diff --git a/ktorrent.1 b/ktorrent.1
index dc6f78b..b25db8c 100644
--- a/ktorrent.1
+++ b/ktorrent.1
@@ -1,20 +1,23 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH KTORRENT "1" "September 2017" "ktorrent 5.1.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.5.
+.TH KTORRENT "1" "June 2020" "ktorrent 5.2.0" "User Commands"
 .SH NAME
-ktorrent \- manual page for ktorrent 5.1.0
+ktorrent \- manual page for ktorrent 5.2.0
 .SH SYNOPSIS
 .B ktorrent
-[\fIoptions\fR]
+[\fI\,options\/\fR]
 .SH DESCRIPTION
 Bittorrent client by KDE
 .SH OPTIONS
 .TP
+\fB\-h\fR, \fB\-\-help\fR
+Displays help on commandline options.
+.TP
+\fB\-\-help\-all\fR
+Displays help including Qt specific options.
+.TP
 \fB\-v\fR, \fB\-\-version\fR
 Displays version information.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Displays this help.
-.TP
 \fB\-\-author\fR
 Show author information.
 .TP
@@ -25,6 +28,9 @@ Show license information.
 The base file name of the desktop entry for this
 application.
 .TP
+\fB\-\-verbose\fR
+Enable logging to standard output
+.TP
 \fB\-\-silent\fR
 Silently open torrent given on URL
 .TP
diff --git a/ktorrent.changes b/ktorrent.changes
index 831e468..a0b8107 100644
--- a/ktorrent.changes
+++ b/ktorrent.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jun  8 14:00:58 UTC 2020 - wbauer@tmo.at
+
+- Update to version 5.2.0
+  * KTorrent now uses QtWebengine instead of QtWebkit
+  * Crash on exit in KTorrent should be fixed
+  * Quite a few small bugfixes but everything should be more stable
+  * Porting away from some deprecated methods
+- Update installed man pages
+
+-------------------------------------------------------------------
+Tue Sep  3 06:24:56 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Compact complicated and fragile "find" statement.
+
 -------------------------------------------------------------------
 Sun Sep  1 19:44:57 UTC 2019 - wbauer@tmo.at
 
diff --git a/ktorrent.spec b/ktorrent.spec
index 8b817bf..1eb7680 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ktorrent
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           ktorrent
-Version:        5.1.2
+Version:        5.2.0
 Release:        0
 Summary:        KDE BitTorrent Client
 License:        GPL-2.0-or-later
@@ -55,8 +55,7 @@ BuildRequires:  cmake(KF5Plotting)
 BuildRequires:  cmake(KF5Solid)
 BuildRequires:  cmake(KF5Syndication)
 BuildRequires:  cmake(KF5TextWidgets)
-BuildRequires:  cmake(KF5Torrent) >= 2.1
-BuildRequires:  cmake(KF5WebKit)
+BuildRequires:  cmake(KF5Torrent) >= 2.2
 BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5WindowSystem)
 BuildRequires:  cmake(KF5XmlGui)
@@ -69,6 +68,9 @@ BuildRequires:  cmake(Qt5Script)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  pkgconfig(taglib)
 Recommends:     %{name}-lang = %{version}
+%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
+BuildRequires:  cmake(Qt5WebEngineWidgets)
+%endif
 
 %description
 KTorrent is a BitTorrent application by KDE which allows you to download files
@@ -95,10 +97,8 @@ cp -a %{SOURCE2} %{buildroot}%{_mandir}/man1
 cp -a %{SOURCE3} %{buildroot}%{_mandir}/man1
 
 # Fix any .py files with shebangs and wrong permissions.
-if test -z "`find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`"; \
-then break;
-else chmod -f 0755 `find %{buildroot} -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \
-fi
+find %{buildroot} -name "*.py" -perm 0644 -exec grep -l '#!' {} + | \
+	xargs -rd'\n' chmod -f a+x
 
 %suse_update_desktop_file -r org.kde.ktorrent Qt KDE Network P2P
 
diff --git a/ktupnptest.1 b/ktupnptest.1
index cc0cb35..8740197 100644
--- a/ktupnptest.1
+++ b/ktupnptest.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH KTUPNP "1" "September 2017" "ktupnp 1.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.5.
+.TH KTUPNP "1" "June 2020" "ktupnp 1.0" "User Commands"
 .SH NAME
 ktupnp \- manual page for ktupnp 1.0
 .SH SYNOPSIS
 .B ktupnptest
-[\fIoptions\fR]
+[\fI\,options\/\fR]
 .SH DESCRIPTION
 KTorrent's UPnP test application
 .SH OPTIONS
@@ -13,7 +13,10 @@ KTorrent's UPnP test application
 Displays version information.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Displays this help.
+Displays help on commandline options.
+.TP
+\fB\-\-help\-all\fR
+Displays help including Qt specific options.
 .TP
 \fB\-\-author\fR
 Show author information.