Accepting request 1112695 from X11:common:Factory

- Update to version 1.1.3+20230831:
  * Revert putting process in background from !55
- revert _service to the original state
- revert drop of xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
  (bsc#1215384)

OBS-URL: https://build.opensuse.org/request/show/1112695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdg-utils?expand=0&rev=59

_service

@@ -2,8 +2,8 @@
   <service mode="manual" name="obs_scm">
     <param name="url">https://gitlab.freedesktop.org/xdg/xdg-utils.git</param>
     <param name="scm">git</param>
+    <param name="changesgenerate">enable</param>
     <param name="filename">xdg-utils</param>
-    <param name="revision">master</param>
     <param name="versionformat">@PARENT_TAG@+%cd</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
-                <param name="url">git://anongit.freedesktop.org/xdg/xdg-utils</param>
-              <param name="changesrevision">1a58bc28f6844898532daf9ee1bf6da7764955a9</param></service></servicedata>
+                <param name="url">https://gitlab.freedesktop.org/xdg/xdg-utils.git</param>
+              <param name="changesrevision">adf064ae472b4cacf11f04f5265a0a86980e4ced</param></service></servicedata>

xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch

@@ -0,0 +1,41 @@
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Wed, 30 Oct 2019 17:11:08 +0100
+Subject: xdg-terminal: don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5
+Patch-mainline: not yet
+References: bsc#1215384
+
+'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 71d56a595cfb..bd2529cde1ad 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=`command -v $terminal`
+ 
+-- 
+2.42.0
+

xdg-utils-1.1.3+20230830.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7bfd6d8e6f8dd3a87ec18c358b9f7e1f6fc08580cde36cfc6fa2fab5e068aae
-size 788492

xdg-utils-1.1.3+20230831.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd295b51ff690d790b1075c38111c7446c4b74be08d814f239f1e7abc1e65b2d
+size 788492

xdg-utils.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 21 05:47:59 UTC 2023 - jslaby@suse.cz
+
+- Update to version 1.1.3+20230831:
+  * Revert putting process in background from !55
+- revert _service to the original state
+- revert drop of xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
+  (bsc#1215384)
+
 -------------------------------------------------------------------
 Thu Aug 31 18:12:21 UTC 2023 - Enrico Belleri <kilgore.trout@idesmi.eu>
 

xdg-utils.obsinfo

@@ -1,4 +1,4 @@
 name: xdg-utils
-version: 1.1.3+20230830
-mtime: 1693370134
-commit: d0b765f4879ea784bfa3c4cb91e5c9240e5df52e
+version: 1.1.3+20230831
+mtime: 1693446718
+commit: adf064ae472b4cacf11f04f5265a0a86980e4ced

xdg-utils.spec

@@ -17,7 +17,7 @@
 
 
 Name:           xdg-utils
-Version:        1.1.3+20230830
+Version:        1.1.3+20230831
 Release:        0
 Summary:        Utilities to uniformly interface desktop environments
 License:        MIT
@@ -27,6 +27,7 @@ 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
+Patch1:         xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
 BuildRequires:  make
 # for xmlto to be able to generate text from html
 BuildRequires:  w3m