From a1ef93669548acd3f8ea59888807bf31922aa053 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:47:14 +0000 Subject: import desktop-file-utils-0.23-1.el7 --- diff --git a/.desktop-file-utils.metadata b/.desktop-file-utils.metadata index c1dda9b..7ed14bb 100644 --- a/.desktop-file-utils.metadata +++ b/.desktop-file-utils.metadata @@ -1 +1 @@ -617f130091dbcc5e739d82ee48e2b3932da5957d SOURCES/desktop-file-utils-0.22.tar.xz +10e9df65fdf2b896ce4d5f16616ea0df7c01d8f8 SOURCES/desktop-file-utils-0.23.tar.xz diff --git a/.gitignore b/.gitignore index 2085ab1..cc43786 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/desktop-file-utils-0.22.tar.xz +SOURCES/desktop-file-utils-0.23.tar.xz diff --git a/SOURCES/desktop-file-utils-0.23-add-pantheon.patch b/SOURCES/desktop-file-utils-0.23-add-pantheon.patch new file mode 100644 index 0000000..c420402 --- /dev/null +++ b/SOURCES/desktop-file-utils-0.23-add-pantheon.patch @@ -0,0 +1,25 @@ +From 5b88c95c45e91781aed441c446210c6979350c3f Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Sat, 20 Aug 2016 10:36:57 +0200 +Subject: Added Pantheon to the list of desktop environments + +https://bugs.freedesktop.org/show_bug.cgi?id=97385 + +diff --git a/src/validate.c b/src/validate.c +index bd31fd5..d414a53 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -366,8 +366,9 @@ static DesktopKeyDefinition registered_action_keys[] = { + { DESKTOP_STRING_TYPE, "Exec", TRUE, FALSE, FALSE, handle_exec_key } + }; + ++/* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Cinnamon", "EDE", "Old" ++ "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Old" + }; + + static struct { +-- +cgit v0.10.2 + diff --git a/SPECS/desktop-file-utils.spec b/SPECS/desktop-file-utils.spec index 9290db3..a8fb8df 100644 --- a/SPECS/desktop-file-utils.spec +++ b/SPECS/desktop-file-utils.spec @@ -3,11 +3,15 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.22 +Version: 0.23 Release: 1%{?dist} -URL: http://www.freedesktop.org/software/desktop-file-utils -Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz +URL: https://www.freedesktop.org/software/desktop-file-utils +Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el +# Add Pantheon to the list of desktop environments (#1333550, fdo#97385) +# upstream patch by David Faure +# https://cgit.freedesktop.org/xdg/desktop-file-utils/commit/?id=5b88c95c45e91781aed441c446210c6979350c3f +Patch0: desktop-file-utils-0.23-add-pantheon.patch License: GPLv2+ Group: Development/Tools @@ -30,6 +34,7 @@ fixing it up in the process. %prep %setup -q +%patch0 -p1 -b .add-pantheon %build %configure @@ -55,6 +60,10 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Thu Nov 24 2016 Kalev Lember - 0.23-1 +- Update to 0.23 +- Resolves: #1386844 + * Thu Apr 30 2015 Ray Strode 0.22-1 - Update to 0.22 Resolves: #1217519