Accepting request 887620 from KDE:Applications

KDE Gear 21.04 OBS-URL: https://build.opensuse.org/request/show/887620 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=131
2021-04-24 21:07:29 +00:00 · 2021-04-24 21:07:29 +00:00 · 1999b109a5
commit 1999b109a5
parent b448dc21ea f3f8716791
7 changed files with 108 additions and 73 deletions
--- a/0001-Defuse-root-block.patch
+++ b/0001-Defuse-root-block.patch
@ -1,4 +1,4 @@
-From 435ed5853b9451ab8fdfff722545c57a8f154625 Mon Sep 17 00:00:00 2001
+From 5cec675834a722a6cb55858074eb7a2d13ec685e Mon Sep 17 00:00:00 2001
 From: Fabian Vogt <fabian@ritter-vogt.de>
 Date: Sat, 18 Feb 2017 13:49:14 +0100
 Subject: [PATCH] Defuse root block
@ -8,43 +8,55 @@ X session (not sandboxed) can use kate's capability to open a console,
 we allow (even encourage) running YaST on X11 as root.
 That way it's only an impact on usability.
 ---
- kate/main.cpp   | 3 +--
- kwrite/main.cpp | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ kate/main.cpp   | 15 ++-------------
+ kwrite/main.cpp | 15 ++-------------
+ 2 files changed, 4 insertions(+), 26 deletions(-)

-Index: kate-19.03.60git.20190930T050110~1d9a68423/kate/main.cpp
-===================================================================
--- kate-19.03.60git.20190930T050110~1d9a68423.orig/kate/main.cpp	2019-09-30 05:01:10.000000000 +0200
-+++ kate-19.03.60git.20190930T050110~1d9a68423/kate/main.cpp	2019-09-30 07:28:13.299460412 +0200
-@@ -60,13 +60,8 @@
+diff --git a/kate/main.cpp b/kate/main.cpp
+index cea01d6..37d418f 100644
+--- a/kate/main.cpp
+++ b/kate/main.cpp
+@@ -48,19 +48,8 @@ int main(int argc, char **argv)
 #ifndef Q_OS_WIN
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
 -        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities. "
+-                         "It is also not necessary; simply use Kate normally, and you will be prompted for "
+-                         "elevated privileges when saving documents if needed."
+-                      << std::endl;
 -            return EXIT_FAILURE;
 -        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities. "
+-                         "It is also not necessary; simply use Kate normally, and you will be prompted for "
+-                         "elevated privileges when saving documents if needed."
+-                      << std::endl;
 -            return EXIT_FAILURE;
 -        }
 +        std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl;
-+        std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl;
+        std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl;
     }
 #endif
     /**
-Index: kate-19.03.60git.20190930T050110~1d9a68423/kwrite/main.cpp
-===================================================================
--- kate-19.03.60git.20190930T050110~1d9a68423.orig/kwrite/main.cpp	2019-09-30 05:01:10.000000000 +0200
-+++ kate-19.03.60git.20190930T050110~1d9a68423/kwrite/main.cpp	2019-09-30 07:28:13.299460412 +0200
-@@ -54,13 +54,8 @@
+diff --git a/kwrite/main.cpp b/kwrite/main.cpp
+index 87cac6f..4f0bad2 100644
+--- a/kwrite/main.cpp
+++ b/kwrite/main.cpp
+@@ -40,19 +40,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
 #ifndef Q_OS_WIN
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
 -        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-            std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+-            std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities. "
+-                         "It is also not necessary; simply use KWrite normally, and you will be prompted for "
+-                         "elevated privileges when saving documents if needed."
+-                      << std::endl;
 -            return EXIT_FAILURE;
 -        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-            std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+-            std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities. "
+-                         "It is also not necessary; simply use KWrite normally, and you will be prompted for "
+-                         "elevated privileges when saving documents if needed."
+-                      << std::endl;
 -            return EXIT_FAILURE;
 -        }
 +        std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl;
@ -52,3 +64,6 @@ Index: kate-19.03.60git.20190930T050110~1d9a68423/kwrite/main.cpp
     }
 #endif
 
+-- 
+2.30.2
+
--- a/kate-20.12.3.tar.xz
+++ b/kate-20.12.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81bc2d8afe1958186feec8b1b275da5d6eb52bd8b4fa154896d19830d628d4fd
-size 5949012
--- a/kate-20.12.3.tar.xz.sig
+++ b/kate-20.12.3.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEAACgkQu0YzUNbv
-Me9oaBAAjxGkF7nTW79SR/NIRcVg1EY+TJBb3gru34e5dP5PDxBCCPda2khVX3N+
-2Xuxl/9NIB7w4Upv3Z8aOXaHqhgfOxfRnBuGdfew3cmOzwcys+DXdJPsWcnImE6m
-907R2yiTFzaDAa3YlHD6M+60SQO98Hc4W8FhRKT8UAta00x8Vx4FZgSNgJTyyZ0C
-qCxw8dxoR3z7DAKigWE4X2IdT1Oez1tkNSWbHK7+SUXDgz8eYthrFL7OAPpzKvaH
-oMbbysrSi6vfK2Fm3lHDTQ+gja2Ll3CjkrvKYpr44vd6YFqr2Cieaav4/B75oH+C
-TPNvTQeHq1rckqQDH6UYE4cU+omjRu8hHitbqjok6Bjo/w+nYnhnPT/TyKCUQxVK
-gXzZvEiuHzgfPI7KzRB14efVG7zRHWzxWhgbXCQKENuzBajH730DKXIakv+MgjqZ
-TuSl/7MyOWhDMfq9g2qSeH1cMYHBZQUpt9+irRG2viYZConIdAPSIG3MnzOZE+Mm
-+9APe+IIDIkhTKal5f57j2wKH/ON6W1Fe95TUkW2l+gJTqfzx9tutYV4hdaGRmuK
-ox0i9TRom3p1P+q+FawHnuevkdXC1UbP9f7ibLmeK/AEmO9pdgcS4LlXbntGc+sj
-0kk/mT5xBGxKlxy5ued4uUO5pzbIvswdMywaPF7kNjeT3umSmWk=
-=6H86
-----END PGP SIGNATURE-----
--- a/kate-21.04.0.tar.xz
+++ b/kate-21.04.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3780cc0de0cf078add7901e255a6524c34f093a4aff2a2d032ed88c20a7421d4
+size 6940360
--- a/kate-21.04.0.tar.xz.sig
+++ b/kate-21.04.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvYACgkQu0YzUNbv
+Me/4JQ/6AwuanngMVesF9qHhXvOV2xNw54hUyX2RNWNAlQgNL7hPI6DqbmMdZTaA
+uBmBlIx1bgAnWCJ2TuvzJGgOKyrUZWKngvnTU1KI+0JwLAp8v1Hgta7G2TkvVy9o
+qbgeFEeWAhYoP0yADmSt2ncBmeeBNTVIb9ssIufQfJEXHI3RcmiZmFrJhXjYUx2V
+oeJ6LSfRBInyxNKZO5ZRbhhxeJVlkY8eNCa39AawN+T/JeCVKsVpcGxXlGJTiRFR
+/OdjS05yG4WqoauKpwm8ngjttFcR0Vh/ocu1b/KIV3miu3RLbvBnB8+qtdxCospx
+2DRG1py9w1ekRgTdmvloW5esCleoqDSHU0EfCDyPcXZOvR4gqQpgitxB9uzU2XAq
+MwWSNS9WOKkRSr7Gl+BZl5Q/qaNjvG6KZaWilzC9h8E4TzUIfaWnoiWF/eL7C5g4
+rpYD96lhSjxea+zazCpBL69IicauJ9rQDDyz4Pi9g0mNfzHfp0hhOwFSn6fyfKiZ
+3mIHHD1fafuntC7fj6DIH/3kfkHhEAS1382xlJ2sZ9LndhWIryg/tHToxaXmxnWt
+nn/c3X7BlUDupQ4DhEH1XEtVKRI4O5KFVUXCMbcI0Ej11pIB7+Jgida1Wc9TydcE
+S18FSC0+ZEHtMuGgR5KYN9Q1eSx4+ZwA0PguUV1n1TJdEObcS70=
+=2hUO
+-----END PGP SIGNATURE-----
--- a/kate.changes
+++ b/kate.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:27 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.04
+- Changes since 21.03.90:
+  * Fix S&R not recovering from canceled folder search (kde#435689)
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
+-------------------------------------------------------------------
+Fri Apr  9 17:39:53 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.90
+  * New feature release
+- Too many changes to list here.
+
+-------------------------------------------------------------------
+Sun Mar 21 13:27:34 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Too many changes to list here.
+- Rebase 0001-Defuse-root-block.patch
+
 -------------------------------------------------------------------
 Thu Mar  4 06:09:53 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>

--- a/kate.spec
+++ b/kate.spec
@ -1,7 +1,7 @@
 #
 # spec file for package kate
 #
-# 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
@ -22,13 +22,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kate
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Advanced Text Editor
 License:        GPL-3.0-or-later
 Group:          Productivity/Text/Editors
-URL:            https://www.kde.org
+URL:            https://kate-editor.org
 Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Defuse-root-block.patch
 BuildRequires:  libgit2-devel
@ -54,23 +58,19 @@ BuildRequires:  cmake(KF5Wallet)
 BuildRequires:  cmake(KF5WindowSystem)
 BuildRequires:  cmake(KF5XmlGui)
 BuildRequires:  cmake(KUserFeedback)
-BuildRequires:  cmake(Qt5Core) >= 5.10.0
-BuildRequires:  cmake(Qt5DBus) >= 5.10.0
-BuildRequires:  cmake(Qt5Script) >= 5.10.0
-BuildRequires:  cmake(Qt5Sql) >= 5.10.0
-BuildRequires:  cmake(Qt5Test) >= 5.10.0
-BuildRequires:  cmake(Qt5Widgets) >= 5.10.0
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5DBus)
+BuildRequires:  cmake(Qt5Script)
+BuildRequires:  cmake(Qt5Sql)
+BuildRequires:  cmake(Qt5Test)
+BuildRequires:  cmake(Qt5Widgets)
 Requires:       %{name}-plugins = %{version}
 Recommends:     %{name}-lang
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif

 %description
-Kate is an advanced text editor for KDE.
+Kate is an advanced text editor by KDE.

 %package -n kwrite
 Summary:        KDE Text Editor
@ -79,7 +79,7 @@ Requires:       %{name}-plugins = %{version}
 Obsoletes:      kwrite5 < %{version}

 %description -n kwrite
-KWrite is the default text editor of the K desktop environment.
+KWrite is a text editor by KDE.

 %package plugins
 Summary:        KDE Text Editor plugins
@ -89,14 +89,13 @@ Provides:       ktexteditorpreviewplugin = %{version}
 Obsoletes:      ktexteditorpreviewplugin < %{version}

 %description plugins
-Kate is an advanced text editor for KDE. This package contains
+Kate is an advanced text editor by KDE. This package contains
 plugins and data files for Kate and KWrite editors.

 %lang_package

 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1

 %build
  %cmake_kf5 -d build
@ -112,9 +111,6 @@ plugins and data files for Kate and KWrite editors.
 %files
 %license LICENSES/*
 %doc README*
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
 %dir %{_kf5_iconsdir}/hicolor/150x150/
 %dir %{_kf5_iconsdir}/hicolor/150x150/apps
 %dir %{_kf5_iconsdir}/hicolor/310x310/
@ -136,8 +132,6 @@ plugins and data files for Kate and KWrite editors.
 %files -n kwrite
 %license LICENSES/*
 %doc README*
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
 %doc %lang(en) %{_kf5_htmldir}/en/kwrite/
 %{_kf5_applicationsdir}/org.kde.kwrite.desktop
 %{_kf5_appstreamdir}/org.kde.kwrite.appdata.xml