diff --git a/_service b/_service index 74d0809..e78292e 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git enable xdg-utils - @PARENT_TAG@+%cd + 1.2.0~beta1+%cd v(.*) \1 diff --git a/_servicedata b/_servicedata index 617f7b2..8bdf7d2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.freedesktop.org/xdg/xdg-utils.git - adf064ae472b4cacf11f04f5265a0a86980e4ced \ No newline at end of file + f8bc7454112899413a60996b7b5d9aebfa4e6864 \ No newline at end of file diff --git a/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch b/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch deleted file mode 100644 index ce28dd3..0000000 --- a/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Christophe Giboudeaux -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 - diff --git a/xdg-utils-1.1.3+20230831.obscpio b/xdg-utils-1.1.3+20230831.obscpio deleted file mode 100644 index d80ae56..0000000 --- a/xdg-utils-1.1.3+20230831.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd295b51ff690d790b1075c38111c7446c4b74be08d814f239f1e7abc1e65b2d -size 788492 diff --git a/xdg-utils-1.2.0~beta1+20230929.obscpio b/xdg-utils-1.2.0~beta1+20230929.obscpio new file mode 100644 index 0000000..846fa6c --- /dev/null +++ b/xdg-utils-1.2.0~beta1+20230929.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b481d03b80dface1c7ab9bad0db44a2e20880acf7ccad1641b821d7ac3f5b0e5 +size 798732 diff --git a/xdg-utils-1.2.0~beta1+20230929.tar.xz b/xdg-utils-1.2.0~beta1+20230929.tar.xz new file mode 100644 index 0000000..8521212 --- /dev/null +++ b/xdg-utils-1.2.0~beta1+20230929.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce282d1895f4578a217c900a29f139a08115d3f441a4b9cd0c5ee87cdaa67afa +size 271932 diff --git a/xdg-utils.changes b/xdg-utils.changes index 5a8d40c..f24c2fc 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Sep 29 08:50:42 UTC 2023 - Simon Lees + +- Update to version 1.2.0-beta1+20230929: + * Set Version to 1.2.0-beta1 + * Update Changes and Release Notes + * fix(xdg-open): handle spaces in .desktop file path + * Quote Browser variable to avod unintentional code execution + * Add missing result gathering + * Enhance LXQt Desktop Enviromment support + * xdg-terminal: don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5 +- Drop the following fix, now actually included upstream + * xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch +- The following entries may have been missed in previous changelog + versions + * all: shellcheck fixes; make xdg-mime DASH-compatible + * xdg-email: do not run BROWSER if xdg-open failed + * Ensure POSIX-compliant shell scripting to support DASH + * all: spelling fixes + * Fix set_url_scheme_handler_gnome3 to not associate text/html handler + * xdg-screensaver: fix the freedesktop screensaver + * xdg-screensaver: implement support for "gnome3" DE + * xdg-screensaver: better error detection for freedesktop 'status' command + * xdg-desktop-menu: Drop obsolete GNOME support + * xdg-open: support WSL (FDO#108975) + * xdg-su: support deepin + * xdg-mime: If mimeapps.list is a symlink, retain the symlink (#7) + * xdg-open: fix search_desktop_file's logic + * xdg-open: handle local hostname in `file:` URLs + * xdg-desk-menu: Check if defaults file exists during installation + * xdg-su: Remove quotes for lxqt-sudo cmd arg + * xdg-open: handle opening files when DE=flatpak + ------------------------------------------------------------------- Thu Sep 21 05:47:59 UTC 2023 - jslaby@suse.cz diff --git a/xdg-utils.obsinfo b/xdg-utils.obsinfo index 40cef83..88b322c 100644 --- a/xdg-utils.obsinfo +++ b/xdg-utils.obsinfo @@ -1,4 +1,4 @@ name: xdg-utils -version: 1.1.3+20230831 -mtime: 1693446718 -commit: adf064ae472b4cacf11f04f5265a0a86980e4ced +version: 1.2.0~beta1+20230929 +mtime: 1695970624 +commit: f8bc7454112899413a60996b7b5d9aebfa4e6864 diff --git a/xdg-utils.spec b/xdg-utils.spec index be03ed8..4ec2c4e 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -17,7 +17,7 @@ Name: xdg-utils -Version: 1.1.3+20230831 +Version: 1.2.0~beta1+20230929 Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT @@ -27,7 +27,6 @@ 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