diff --git a/.desktop-file-utils.metadata b/.desktop-file-utils.metadata index 7ed14bb..596409a 100644 --- a/.desktop-file-utils.metadata +++ b/.desktop-file-utils.metadata @@ -1 +1 @@ -10e9df65fdf2b896ce4d5f16616ea0df7c01d8f8 SOURCES/desktop-file-utils-0.23.tar.xz +9fd94cb7de302163015fcbc0e157c61323b1205d SOURCES/desktop-file-utils-0.26.tar.xz diff --git a/.gitignore b/.gitignore index cc43786..6282bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/desktop-file-utils-0.23.tar.xz +SOURCES/desktop-file-utils-0.26.tar.xz diff --git a/SOURCES/desktop-file-utils-0.23-add-pantheon.patch b/SOURCES/desktop-file-utils-0.23-add-pantheon.patch deleted file mode 100644 index c420402..0000000 --- a/SOURCES/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/SOURCES/desktop-file-utils-0.23-font-media.patch b/SOURCES/desktop-file-utils-0.23-font-media.patch deleted file mode 100644 index c597c9a..0000000 --- a/SOURCES/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/SOURCES/desktop-file-utils-0.26-support-1.5.patch b/SOURCES/desktop-file-utils-0.26-support-1.5.patch new file mode 100644 index 0000000..1954984 --- /dev/null +++ b/SOURCES/desktop-file-utils-0.26-support-1.5.patch @@ -0,0 +1,83 @@ +From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 15 Feb 2022 10:54:40 +0000 +Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5 + +Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 +--- + src/validate.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/validate.c b/src/validate.c +index 62406ab..ebb03b5 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { + /* Since 1.4 */ + { DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL }, + ++ /* Since 1.5 */ ++ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, ++ + /* Keys reserved for KDE */ + + /* since 0.9.4 */ +-- +2.38.1 + + +From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 15 Feb 2022 10:56:04 +0000 +Subject: [PATCH 2/2] validate: Support version 1.5 + +Bump CURRENT_SPEC_VERSION to 1.5. +--- + man/desktop-file-validate.1 | 2 +- + src/validate.c | 3 +++ + src/validate.h | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1 +index 8e17411..ce87c47 100644 +--- a/man/desktop-file-validate.1 ++++ b/man/desktop-file-validate.1 +@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files + .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE... + .SH DESCRIPTION + The \fIdesktop-file-validate\fP program is a tool to validate desktop +-entry files according to the Desktop Entry specification 1.4. ++entry files according to the Desktop Entry specification 1.5. + .PP + The specification describes a file format to provide information such as + name, icon and description for an application. Such a file can then be +diff --git a/src/validate.c b/src/validate.c +index ebb03b5..f9eedee 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf, + const char *locale_key, + const char *value) + { ++ if (!strcmp (value, "1.5")) ++ return TRUE; ++ + if (!strcmp (value, "1.4")) + return TRUE; + +diff --git a/src/validate.h b/src/validate.h +index e6efd93..a7952cd 100644 +--- a/src/validate.h ++++ b/src/validate.h +@@ -30,7 +30,7 @@ + + #include + +-#define CURRENT_SPEC_VERSION "1.4" ++#define CURRENT_SPEC_VERSION "1.5" + + #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" + #define GROUP_DESKTOP_ACTION "Desktop Action " +-- +2.38.1 + diff --git a/SPECS/desktop-file-utils.spec b/SPECS/desktop-file-utils.spec index d5bf395..f635923 100644 --- a/SPECS/desktop-file-utils.spec +++ b/SPECS/desktop-file-utils.spec @@ -1,29 +1,24 @@ -%global pkg desktop-file-utils -%global pkgname desktop-file-utils - Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.23 -Release: 8%{?dist} +Version: 0.26 +Release: 1%{?dist} 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 -# Add 'font' as a valid media type (#1564650, fdo#105785) -# patch from Matthias Clasen -Patch1: desktop-file-utils-0.23-font-media.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2053905 +Patch0: desktop-file-utils-0.26-support-1.5.patch License: GPLv2+ +BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs +BuildRequires: meson Requires: emacs-filesystem -Provides: emacs-%{pkg} = %{version}-%{release} -Provides: emacs-%{pkg}-el = %{version}-%{release} -Obsoletes: emacs-%{pkg} < 0.20-3 -Obsoletes: emacs-%{pkg}-el < 0.20-3 +# Old, removed in RHEL 9+. +Provides: emacs-%{name} = %{version}-%{release} +Provides: emacs-%{name}-el = %{version}-%{release} +Obsoletes: emacs-%{name} < 0.20-3 +Obsoletes: emacs-%{name}-el < 0.20-3 %description .desktop files are used to describe an application for inclusion in @@ -38,14 +33,14 @@ fixing it up in the process. %autosetup -p1 %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%meson_install -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg} -mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg} +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.el touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc @@ -59,15 +54,19 @@ update-desktop-database &> /dev/null || : %doc AUTHORS README NEWS %license COPYING %{_bindir}/* -%{_mandir}/man1/desktop-file-install.1.gz -%{_mandir}/man1/desktop-file-validate.1.gz -%{_mandir}/man1/update-desktop-database.1.gz -%{_mandir}/man1/desktop-file-edit.1.gz +%{_mandir}/man1/desktop-file-install.1* +%{_mandir}/man1/desktop-file-validate.1* +%{_mandir}/man1/update-desktop-database.1* +%{_mandir}/man1/desktop-file-edit.1* %{_emacs_sitestartdir}/desktop-entry-mode-init.el %ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc -%{_emacs_sitelispdir}/%{pkg} +%{_emacs_sitelispdir}/%{name} %changelog +* Thu Nov 10 2022 David King - 0.26-1 +- Rebase to 0.26 (#2107277) +- Support files conforming to 1.5 of the specification (#2107277) + * Mon Apr 09 2018 Adam Williamson - 0.23-8 - Add 'font' as a valid media type (#1564650, fdo#105785)