diff --git a/desktop-file-utils-0.23-add-pantheon.patch b/desktop-file-utils-0.23-add-pantheon.patch deleted file mode 100644 index c420402..0000000 --- a/desktop-file-utils-0.23-add-pantheon.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/desktop-file-utils-0.23-font-media.patch b/desktop-file-utils-0.23-font-media.patch deleted file mode 100644 index c597c9a..0000000 --- a/desktop-file-utils-0.23-font-media.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 16fa31708d6b6af047352d1a78a7eab823b63221 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 9 Apr 2018 17:06:37 -0400 -Subject: [PATCH] Add font as valid media type - -This was codified in RFC 8081, and some desktop apps are using -this now. ---- - src/mimeutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mimeutils.c b/src/mimeutils.c -index 0833fdb..bddc7a0 100644 ---- a/src/mimeutils.c -+++ b/src/mimeutils.c -@@ -52,9 +52,9 @@ static const char *known_old_fdo_media_types[] = { - "x-directory" - }; - --/* Defined in RFC 2045/2046 and RFC 2077 */ -+/* Defined in RFC 2045/2046, RFC 2077 and RFC 8081 */ - static const char *registered_discrete_media_types[] = { -- "application", "audio", "image", "model", "text", "video" -+ "application", "audio", "font", "image", "model", "text", "video" - }; - - /* Defined in RFC 2045/2046 */ --- -2.17.0 - diff --git a/desktop-file-utils-0.23.tar.xz b/desktop-file-utils-0.23.tar.xz deleted file mode 100644 index ac90708..0000000 Binary files a/desktop-file-utils-0.23.tar.xz and /dev/null differ diff --git a/desktop-file-utils-0.24.tar.xz b/desktop-file-utils-0.24.tar.xz new file mode 100644 index 0000000..a15bfd6 Binary files /dev/null and b/desktop-file-utils-0.24.tar.xz differ diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 53296d0..9e857f4 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,16 +1,12 @@ Name: desktop-file-utils -Version: 0.23 -Release: 10 +Version: 0.24 +Release: 1 Summary: Desktop-file-utils contains utilities for manipulating desktop entries License: GPLv2+ 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 -#patches from upstream -Patch0: desktop-file-utils-0.23-add-pantheon.patch -Patch1: desktop-file-utils-0.23-font-media.patch - BuildRequires: glib2-devel emacs Requires: emacs-filesystem Provides: emacs-%{name} = %{version}-%{release} emacs-%{name}-el = %{version}-%{release} @@ -59,6 +55,12 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_mandir}/man1/* %changelog +* Thu Jan 9 2020 openEuler Buildteam - 0.24-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrade to 0.24 + * Mon Sep 9 2019 yanzhihua - 0.23-10 - Package init