Accepting request 745124 from home:cgiboudeaux:branches:X11:common:Factory

Add an inconsistent change requested by the package maintainer.

OBS-URL: https://build.opensuse.org/request/show/745124
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=71

0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch

@@ -0,0 +1,40 @@
+From e47c61cb3c780cd091038c8b580eca6e10679a11 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Wed, 30 Oct 2019 17:11:08 +0100
+Subject: [PATCH] Don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5.
+
+'kreadconfig' is a KDE4 executable. The program is called 'kreadconfig5' in
+KDE Frameworks 5.xx.
+---
+ scripts/xdg-terminal.in | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
+index 36a9833..05a3c44 100644
+--- a/scripts/xdg-terminal.in
++++ b/scripts/xdg-terminal.in
+@@ -30,7 +30,20 @@ _USAGE
+ 
+ terminal_kde()
+ {
+-    terminal=`kreadconfig --file kdeglobals --group General --key TerminalApplication --default konsole`
++    if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then
++        local kreadconfig=kreadconfig$KDE_SESSION_VERSION
++    else
++        local kreadconfig=kreadconfig
++    fi
++
++    if which $kreadconfig >/dev/null 2>&1; then
++        local terminal=$($kreadconfig --file kdeglobals \
++                                      --group General \
++                                      --key TerminalApplication \
++                                      --default konsole)
++    else
++        exit_failure_operation_impossible "'$kreadconfig' was not found or is not executable"
++    fi
+ 
+     terminal_exec=`which $terminal 2>/dev/null`
+ 
+-- 
+2.23.0
+

xdg-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 30 16:12:34 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch
+  to read the KDE Frameworks config file if necessary (boo#1155462)
+
 -------------------------------------------------------------------
 Mon Sep 30 10:47:49 UTC 2019 - jslaby@suse.com
 

xdg-utils.spec

@@ -27,6 +27,8 @@ Url:            https://www.freedesktop.org/wiki/Software/xdg-utils/
 Source:         xdg-utils-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff jslaby@suse.cz
 Patch0:         install-some-more-scripts.diff
+# PATCH-FIX-UPSTREAM 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch
+Patch1:         0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch
 BuildRequires:  make
 # for xmlto to be able to generate text from html
 BuildRequires:  w3m
@@ -55,8 +57,7 @@ This means that:
    environment.
 
 %prep
-%setup -q
+%autosetup -p1
-%autopatch -p1
 
 %build
 %configure