From 0a883663fcf28f2559d70090814bf6d1ec56aeb913f0436d7e73e893d7d0de92 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Mon, 3 Aug 2020 08:29:35 +0000
Subject: [PATCH] 20.08 RC

the i586 scheduler is dead and our gpgme:qt build fails since the 1.14 update

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=220
---
 dolphin-20.07.80.tar.xz     |  3 ---
 dolphin-20.07.80.tar.xz.sig | 16 ----------------
 dolphin-20.07.90.tar.xz     |  3 +++
 dolphin-20.07.90.tar.xz.sig | 11 +++++++++++
 dolphin.changes             |  9 +++++++++
 dolphin.spec                | 11 ++++-------
 6 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 dolphin-20.07.80.tar.xz
 delete mode 100644 dolphin-20.07.80.tar.xz.sig
 create mode 100644 dolphin-20.07.90.tar.xz
 create mode 100644 dolphin-20.07.90.tar.xz.sig

diff --git a/dolphin-20.07.80.tar.xz b/dolphin-20.07.80.tar.xz
deleted file mode 100644
index 25074cc..0000000
--- a/dolphin-20.07.80.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ce58b42dd61fecd9f8f88440e6864ab937ec0c3dc1c0a4c6bcde0c682fd4ad7
-size 5084396
diff --git a/dolphin-20.07.80.tar.xz.sig b/dolphin-20.07.80.tar.xz.sig
deleted file mode 100644
index 00c658d..0000000
--- a/dolphin-20.07.80.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl8RtO4ACgkQOmpNuDnq
-ptcoNRAAoyOXrK53wEBKgDtbedgt6PtuwD5Ig7x/+cLEelBdSL1C99M+0YWcIIeC
-6Vmsgkfd4WYvg+2UscX3oJqlqCDmuJh/KAa86SFphlZ2zMg1io+cJ0plBIkDuSSm
-T03HKpsGXZkBo1eHprRzyzZ/pkeLUumMhA+XY1KEtnxYNmMAqvh8ms2kOzF8s+mn
-mxJacREAgRzOraflIefhWjTkFeU61EKErOvqCYra1efbz7HPYUZgEKvjRVzhZmmE
-AQ+YFxu6MZ4Hrn61h4dBlFckbA/FGs5AXy0z3f5fdWbjXEaR1t33pwl2L5oGNB0I
-8DaXk4ZTNBny1y7UoLMU4P8LV5JBwyFi/CA3cLkanocvJ2HlGloamy+Nb+3Fl+3e
-CPu50QHSsbjpQyWnqUnTcy/5D8n3dMRwKPjqOn82U42eUTtsCRXrmNF5vvJrjjSu
-VNTfFlCKf3KimkCKT586JNsWkE967B/CxqGcXiP8eVyoMJLXOTComZUvMza2KSOL
-lNgaZEQBHZtoFRCU8McY8X42QENnF7gg3KJDa9+YCqEhMsNy3xfMbDU7yMsp0AaW
-aPteUcP+P31mSGm5VtKKtyu25FuoAD0ayxj04QV6X+ghpNbEpKAF0COCG8SF81Dp
-xCjtvwaCyrmFdOQUigvZjPXAKK6eKWdrlzVlQcgqO8nm5Nb6kFs=
-=IO5K
------END PGP SIGNATURE-----
diff --git a/dolphin-20.07.90.tar.xz b/dolphin-20.07.90.tar.xz
new file mode 100644
index 0000000..bc56fed
--- /dev/null
+++ b/dolphin-20.07.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66918f5480ba3699e90b0be7b55a26f44a08e3c658fd9b4e62733462fa938b7f
+size 5088492
diff --git a/dolphin-20.07.90.tar.xz.sig b/dolphin-20.07.90.tar.xz.sig
new file mode 100644
index 0000000..3f0a2e6
--- /dev/null
+++ b/dolphin-20.07.90.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl8kk/UACgkQ29LOiT4t
+HIc/vAf+O3t9eOjPhqnmdNuAdUGSVCu45eD34ohNjNKHEeRReBaDKZKW6ujKU06j
+DK7kaI+ZD8kHFuZ4vxbcn14D4pnJa4ahOUkzVi7NEkJvFC/znMpZxo+sMw5DVsao
+5PN2h9UyDB2FEN2AYv4k3dZJC4yAHIECSBXu5hp88deecxJqZtf2mywcxJ6NwMug
+c+dO75fJ8YURMGhpq4woZtnK0xP2D/v3eiUDaKmKstt+Xaj8GS16vnJO68Bw5ao4
+DpDY4K/duELdSI5LfuiQ8nB3JBcg3Pme8TnU0FU4YE+pcZMgPVPVk3azY7td22Ve
+SMMs8+smBtUBe7CZfsMb5//dnDwljA==
+=t+g8
+-----END PGP SIGNATURE-----
diff --git a/dolphin.changes b/dolphin.changes
index ae59c4c..dfb2a87 100644
--- a/dolphin.changes
+++ b/dolphin.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Aug  2 07:58:35 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.07.90
+  * New feature release
+- Changes since 20.07.80:
+  * Fix "Show folders, tabs, and window state from last time" feature (kde#422300)
+  * Fix deprecated knsrc file location
+
 -------------------------------------------------------------------
 Sun Jul 19 10:03:46 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/dolphin.spec b/dolphin.spec
index 7c5eaa1..452e8ee 100644
--- a/dolphin.spec
+++ b/dolphin.spec
@@ -21,7 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           dolphin
-Version:        20.07.80
+Version:        20.07.90
 Release:        0
 Summary:        KDE File Manager
 License:        GPL-2.0-or-later
@@ -104,7 +104,6 @@ This package contains the libraries used by Dolphin and Konqueror.
 
 %if %{with lang}
 %package -n %{name}-part-lang
-# FIXME: consider using %%lang_package macro
 Summary:        Translations for package %{name}
 Group:          System/Localization
 Requires:       %{name}-part = %{version}
@@ -120,8 +119,7 @@ Provides translations for the "%{name}" package.
 %endif
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -165,12 +163,13 @@ Provides translations for the "%{name}" package.
 %files part
 %license COPYING*
 %doc README.md
-%config %{_kf5_configdir}/servicemenu.knsrc
 %dir %{_kf5_configkcfgdir}
 %dir %{_kf5_plugindir}
 %dir %{_kf5_servicesdir}
 %dir %{_kf5_servicetypesdir}
 %{_kf5_configkcfgdir}/dolphin_*.kcfg
+%{_kf5_debugdir}/dolphin.categories
+%{_kf5_knsrcfilesdir}/servicemenu.knsrc
 %{_kf5_libdir}/libdolphinprivate.so.*
 %{_kf5_plugindir}/dolphinpart.so
 %{_kf5_plugindir}/kcm_dolphin*.so
@@ -180,8 +179,6 @@ Provides translations for the "%{name}" package.
 %{_kf5_servicesdir}/kcmdolphinservices.desktop
 %{_kf5_servicesdir}/kcmdolphinviewmodes.desktop
 %{_kf5_servicetypesdir}/fileviewversioncontrolplugin.desktop
-#{_kf5_sharedir}/dolphinpart/
-%{_kf5_debugdir}/dolphin.categories
 
 %files -n libdolphinvcs5
 %license COPYING*