From d7cc907ff7139d82e5642eca6328620705c1830e Mon Sep 17 00:00:00 2001 From: Till Maas Date: Apr 15 2014 05:59:20 +0000 Subject: Fix patch from 1.1.0-0.23.rc2 (#1086122) --- diff --git a/0010-xdg-open-Support-multiple-groups.patch b/0010-xdg-open-Support-multiple-groups.patch index 76a2b45..dff1c50 100644 --- a/0010-xdg-open-Support-multiple-groups.patch +++ b/0010-xdg-open-Support-multiple-groups.patch @@ -1,4 +1,4 @@ -From 04eda04f2068f709b4a599ec8a06643d4f80565d Mon Sep 17 00:00:00 2001 +From 29b93bdf83712b75be0d6992da4aafa509ab43b7 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Fri, 11 Apr 2014 18:35:34 +0200 Subject: [PATCH 10/10] xdg-open: Support multiple groups @@ -10,7 +10,7 @@ Desktop Entry group. 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index e7a15a9..b994fa5 100644 +index e7a15a9..35f4b76 100644 --- a/scripts/xdg-open.in +++ b/scripts/xdg-open.in @@ -36,15 +36,36 @@ last_word() @@ -46,7 +46,7 @@ index e7a15a9..b994fa5 100644 + # Only match Desktop Entry group + if [ -n "${desktop_entry}" ] + then -+ echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2- ++ echo "${line}" | grep -E "^${key}=" | cut -d= -f 2- + fi + esac + done < "${file}" diff --git a/xdg-utils.spec b/xdg-utils.spec index 4fc4e87..fa1fadd 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -4,7 +4,7 @@ Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.0 -Release: 0.23.%{pre}%{?dist} +Release: 0.24.%{pre}%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?pre:1} @@ -108,6 +108,9 @@ make install DESTDIR=%{buildroot} %changelog +* Tue Apr 15 2014 Till Maas - 1.1.0-0.24.rc2 +- Fix patch from 1.1.0-0.23.rc2 (#1086122) + * Fri Apr 11 2014 Till Maas - 1.1.0-0.23.rc2 - Fix handling of desktop files with multiple groups (#1086122)