diff --git a/xdg-utils-egrep.patch b/xdg-utils-egrep.patch new file mode 100644 index 0000000..7c949ed --- /dev/null +++ b/xdg-utils-egrep.patch @@ -0,0 +1,29 @@ +From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001 +From: E5ten +Date: Thu, 16 Jan 2020 02:06:09 +0000 +Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E" +References: https://bugzilla.opensuse.org/show_bug.cgi?id=1203092 + https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21 + https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/44 + https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/207 + +--- + scripts/xdg-open.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in +index 202f3e3..35b0522 100644 +--- a/scripts/xdg-open.in ++++ b/scripts/xdg-open.in +@@ -72,7 +72,7 @@ get_key() + is_file_url_or_path() + { + if echo "$1" | grep -q '^file://' \ +- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then ++ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then + return 0 + else + return 1 +-- +GitLab + diff --git a/xdg-utils.changes b/xdg-utils.changes index e509cd4..18fbc3f 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 4 17:29:24 UTC 2022 - Andreas Stieger + +- xdg-open: convert usage of obsolete egrep to grep -E + add xdg-utils-egrep.patch, boo#1203092 + ------------------------------------------------------------------- Tue Jul 26 07:16:43 UTC 2022 - jslaby@suse.cz diff --git a/xdg-utils.spec b/xdg-utils.spec index b8b5ef7..4da9951 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -31,6 +31,7 @@ Patch0: install-some-more-scripts.diff Patch1: 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch # PATCH-FIX-OPENSUSE support-deepin-desktop.patch hillwood@opensuse.org Patch2: support-deepin-desktop.patch +Patch3: xdg-utils-egrep.patch BuildRequires: make # for xmlto to be able to generate text from html BuildRequires: w3m