From d250ee4bf44870f458c20cd24b9bada58d03cc8e Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 15 Oct 2025 16:22:21 +0100 Subject: [PATCH] Fix syntax (RHEL-65632) Resolves: RHEL-65632 --- xdg-utils-1.2.0-fix-syntax.patch | 25 +++++++++++++++++++++++++ xdg-utils.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 xdg-utils-1.2.0-fix-syntax.patch diff --git a/xdg-utils-1.2.0-fix-syntax.patch b/xdg-utils-1.2.0-fix-syntax.patch new file mode 100644 index 0000000..6e72d9c --- /dev/null +++ b/xdg-utils-1.2.0-fix-syntax.patch @@ -0,0 +1,25 @@ +From af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Tue, 30 Jan 2024 11:24:41 +0100 +Subject: xdg-icon-resource: unbreak syntax by removing stray grave accent + +--- + scripts/xdg-icon-resource.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-icon-resource.in b/scripts/xdg-icon-resource.in +index 0bfa26b..47ba6d6 100644 +--- a/scripts/xdg-icon-resource.in ++++ b/scripts/xdg-icon-resource.in +@@ -306,7 +306,7 @@ fi + need_kde_icon_path() + { + local path +- path="$(xdg_realpath "$1")" 2> /dev/null` # Normalize path ++ path="$(xdg_realpath "$1")" 2> /dev/null # Normalize path + DEBUG 2 "need_kde_icon_path $path" + if [ -z "$path" ] ; then + DEBUG 2 "need_kde_icon_path RETURN 1 (not needed, no xdg icon dir)" +-- +cgit v1.2.3 + diff --git a/xdg-utils.spec b/xdg-utils.spec index e48a663..97a5494 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,7 +1,7 @@ Summary: Basic desktop integration functions Name: xdg-utils Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://www.freedesktop.org/wiki/Software/xdg-utils/ %if 0%{?snap:1} @@ -10,6 +10,8 @@ Source0: xdg-utils-%{version}-%{snap}.tar.gz Source0: https://gitlab.freedesktop.org/xdg/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz %endif License: MIT +# https://issues.redhat.com/browse/RHEL-65632 +Patch0: xdg-utils-1.2.0-fix-syntax.patch # make sure BuildArch comes *after* patches, to ensure %%autosetup works right # http://bugzilla.redhat.com/1084309 @@ -85,6 +87,9 @@ make man scripts %{?_smp_mflags} -C scripts %changelog +* Wed Oct 15 2025 David King - 1.2.0-4 +- Fix syntax (RHEL-65632) + * Tue Oct 29 2024 Troy Dawson - 1.2.0-3 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018