From 4e0eb98229334c3cd08e6abd0780c025f9f36157 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:36:44 -0600 Subject: [PATCH 01/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 08ec0aa..a8f449d 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.21 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Oct 19 2012 Kalev Lember - 0.21-1 - Update to 0.21 From c204c35afc3e1f727d754e169b27a890b0882095 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:01:22 -0500 Subject: [PATCH 02/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index a8f449d..721a0d6 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.21 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 0.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 4348fc43c4c23326c6aeeca289f3c5238732e15b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 29 Aug 2013 14:35:19 +0200 Subject: [PATCH 03/51] Update to 0.22 --- .gitignore | 1 + desktop-file-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5715619..36239ec 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.19.tar.xz /desktop-file-utils-0.20.tar.xz /desktop-file-utils-0.21.tar.xz +/desktop-file-utils-0.22.tar.xz diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 721a0d6..e5092a5 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -3,8 +3,8 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.21 -Release: 3%{?dist} +Version: 0.22 +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 Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Thu Aug 29 2013 Kalev Lember - 0.22-1 +- Update to 0.22 + * Sat Aug 03 2013 Fedora Release Engineering - 0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 775bbee..0575df7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fda5c312c9fb3b8d818fb54f2c34db82 desktop-file-utils-0.21.tar.xz +c6b9f9aac1ea143091178c23437e6cd0 desktop-file-utils-0.22.tar.xz From 049cd1a3358d7f18fd0aafc294c119de5fee43cd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 02:10:18 -0500 Subject: [PATCH 04/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index e5092a5..35e7b85 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Aug 29 2013 Kalev Lember - 0.22-1 - Update to 0.22 From 0d7f0e9c129e6e1281e6fac03fedd89e673e03b0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 02:34:11 +0000 Subject: [PATCH 05/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 35e7b85..ec00c47 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From cd156d6964e8a739f373a68436483e9441d927e6 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:19:02 +0100 Subject: [PATCH 06/51] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- desktop-file-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index ec00c47..23500a5 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,10 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Feb 21 2015 Till Maas - 0.22-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Sat Aug 16 2014 Fedora Release Engineering - 0.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3b78ea13a2be3256443a390ce8075b83d664f17f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:54:02 +0000 Subject: [PATCH 07/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 23500a5..b736049 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -55,6 +55,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 21 2015 Till Maas - 0.22-4 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 92d995fa5528ad1913b28fb0af741c579ee425c8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 14 Aug 2015 15:07:48 -0400 Subject: [PATCH 08/51] Add file triggers --- desktop-file-utils.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index b736049..99364a0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -43,6 +43,12 @@ mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdi 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 +%transfiletriggerin -- %{_datadir}/applications +update-desktop-database + +%transfiletriggerpostun -- %{_datadir}/applications +update-desktop-database + %files %doc AUTHORS COPYING README NEWS %{_bindir}/* @@ -55,6 +61,9 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_emacs_sitelispdir}/%{pkg} %changelog +* Fri Aug 14 2015 Matthias Clasen - 0.22-6 +- Add file triggers for desktop file mime extraction + * Wed Jun 17 2015 Fedora Release Engineering - 0.22-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5f882bea27c9709ccf66fe44220811b574a29f62 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:36:10 +0000 Subject: [PATCH 09/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 99364a0..f726309 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.22 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -61,6 +61,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.22-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Aug 14 2015 Matthias Clasen - 0.22-6 - Add file triggers for desktop file mime extraction From d7239f390d4473ffe82381a29f311558db20e58c Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 1 Jul 2016 11:53:44 -0500 Subject: [PATCH 10/51] Remove old, unapplied patches --- ...s-0.14-make-icon-extension-non-fatal.patch | 12 --- desktop-file-utils-0.18-unity.patch | 23 ----- localelist-fixup.patch | 99 ------------------- scheme-handler.patch | 12 --- 4 files changed, 146 deletions(-) delete mode 100644 desktop-file-utils-0.14-make-icon-extension-non-fatal.patch delete mode 100644 desktop-file-utils-0.18-unity.patch delete mode 100644 localelist-fixup.patch delete mode 100644 scheme-handler.patch diff --git a/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch b/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch deleted file mode 100644 index 2e96912..0000000 --- a/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal desktop-file-utils-0.14/src/validate.c ---- desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal 2007-12-06 21:52:11.000000000 -0500 -+++ desktop-file-utils-0.14/src/validate.c 2007-12-06 21:52:39.000000000 -0500 -@@ -737,7 +737,7 @@ handle_icon_key (kf_validator *kf, - if (g_str_has_suffix (value, ".png") || - g_str_has_suffix (value, ".xpm") || - g_str_has_suffix (value, ".svg")) { -- print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon " -+ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon " - "name with an extension, but there should be no extension " - "as described in the Icon Theme Specification if the " - "value is not an absolute path\n", diff --git a/desktop-file-utils-0.18-unity.patch b/desktop-file-utils-0.18-unity.patch deleted file mode 100644 index 23708bc..0000000 --- a/desktop-file-utils-0.18-unity.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 31 Mar 2011 16:28:44 +0000 -Subject: Add Unity to list of registered environments - -See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html ---- -diff --git a/src/validate.c b/src/validate.c -index 04bc8d0..9c399a3 100644 ---- a/src/validate.c -+++ b/src/validate.c -@@ -338,7 +338,7 @@ static struct { - }; - - static const char *show_in_registered[] = { -- "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old" -+ "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old" - }; - - static struct { --- -cgit v0.8.3-6-g21f6 - diff --git a/localelist-fixup.patch b/localelist-fixup.patch deleted file mode 100644 index 4952197..0000000 --- a/localelist-fixup.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up desktop-file-utils-0.19/src/validate.c.localelist desktop-file-utils-0.19/src/validate.c ---- desktop-file-utils-0.19/src/validate.c.localelist 2011-12-19 09:58:16.000000000 -0500 -+++ desktop-file-utils-0.19/src/validate.c 2011-12-23 15:33:00.667543077 -0500 -@@ -2722,12 +2722,41 @@ desktop_file_validate (const char *filen - return (!kf.fatal_error); - } - -+static void -+fixup_list (GKeyFile *keyfile, -+ const gchar *filename, -+ const gchar *key) -+{ -+ char *value; -+ -+ value = g_key_file_get_value (keyfile, GROUP_DESKTOP_ENTRY, key, NULL); -+ if (value) { -+ int len; -+ -+ len = strlen (value); -+ -+ if (len > 0 && (value[len - 1] != ';' || -+ (len > 1 && value[len - 2] == '\\' && -+ (len < 3 || value[len - 3] != '\\')))) { -+ char *str; -+ -+ g_printerr ("%s: warning: key \"%s\" is a list and does not have a " -+ "semicolon as trailing character, fixing\n", -+ filename, key); -+ -+ str = g_strconcat (value, ";", NULL); -+ g_key_file_set_value (keyfile, GROUP_DESKTOP_ENTRY, -+ key, str); -+ g_free (str); -+ } -+ } -+} -+ - /* return FALSE if we were unable to fix the file */ - gboolean - desktop_file_fixup (GKeyFile *keyfile, - const char *filename) - { -- char *value; - unsigned int i; - - if (g_key_file_has_group (keyfile, GROUP_KDE_DESKTOP_ENTRY)) { -@@ -2739,33 +2768,28 @@ desktop_file_fixup (GKeyFile *keyfile, - - /* Fix lists to have a ';' at the end if they don't */ - for (i = 0; i < G_N_ELEMENTS (registered_desktop_keys); i++) { -- if (registered_desktop_keys[i].type != DESKTOP_STRING_LIST_TYPE && -- registered_desktop_keys[i].type != DESKTOP_REGEXP_LIST_TYPE) -- continue; -- -- value = g_key_file_get_value (keyfile, GROUP_DESKTOP_ENTRY, -- registered_desktop_keys[i].name, NULL); -- if (value) { -- int len; -- -- len = strlen (value); -- -- if (len > 0 && (value[len - 1] != ';' || -- (len > 1 && value[len - 2] == '\\' && -- (len < 3 || value[len - 3] != '\\')))) { -- char *str; -- -- g_printerr ("%s: warning: key \"%s\" is a list and does not have a " -- "semicolon as trailing character, fixing\n", -- filename, registered_desktop_keys[i].name); -- -- str = g_strconcat (value, ";", NULL); -- g_key_file_set_value (keyfile, GROUP_DESKTOP_ENTRY, -- registered_desktop_keys[i].name, str); -- g_free (str); -+ if (registered_desktop_keys[i].type == DESKTOP_STRING_LIST_TYPE || -+ registered_desktop_keys[i].type == DESKTOP_REGEXP_LIST_TYPE) -+ fixup_list (keyfile, filename, registered_desktop_keys[i].name); -+ -+ if (registered_desktop_keys[i].type == DESKTOP_LOCALESTRING_LIST_TYPE) { -+ gsize len, keylen; -+ guint j; -+ gchar **keys; -+ -+ keylen = strlen (registered_desktop_keys[i].name); -+ len = 0; -+ keys = g_key_file_get_keys (keyfile, GROUP_DESKTOP_ENTRY, &len, NULL); -+ for (j = 0; j < len; j++) { -+ if (g_str_has_prefix (keys[j], registered_desktop_keys[i].name) && -+ (keys[j][keylen] == '[' || keys[j][keylen] == '\0')) { -+ fixup_list (keyfile, filename, keys[j]); -+ } - } -+ g_strfreev (keys); - } - } - - return TRUE; - } -+ diff --git a/scheme-handler.patch b/scheme-handler.patch deleted file mode 100644 index 71a760f..0000000 --- a/scheme-handler.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up desktop-file-utils-0.16/src/mimeutils.c.scheme-handler desktop-file-utils-0.16/src/mimeutils.c ---- desktop-file-utils-0.16/src/mimeutils.c.scheme-handler 2010-11-05 13:26:01.315300002 -0400 -+++ desktop-file-utils-0.16/src/mimeutils.c 2010-11-05 13:26:15.749299997 -0400 -@@ -40,7 +40,7 @@ - - /* Not registered with IANA, but used on a free desktop */ - static const char *known_fdo_media_types[] = { -- "inode", "x-content" -+ "inode", "x-content", "x-scheme-handler" - }; - - static const char *known_old_fdo_media_types[] = { From 885f88a2e07e4971c574c6374e33155d27cb4898 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 1 Jul 2016 11:56:19 -0500 Subject: [PATCH 11/51] Update to 0.23 --- .gitignore | 1 + desktop-file-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36239ec..50c480a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.20.tar.xz /desktop-file-utils-0.21.tar.xz /desktop-file-utils-0.22.tar.xz +/desktop-file-utils-0.23.tar.xz diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index f726309..b0674b1 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -3,8 +3,8 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.22 -Release: 7%{?dist} +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 Source1: desktop-entry-mode-init.el @@ -61,6 +61,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Fri Jul 01 2016 Michael Catanzaro - 0.23-1 +- Update to 0.23 + * Wed Feb 03 2016 Fedora Release Engineering - 0.22-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 0575df7..b3b4a1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6b9f9aac1ea143091178c23437e6cd0 desktop-file-utils-0.22.tar.xz +599133d51cc9a41bfec186414906b6f1 desktop-file-utils-0.23.tar.xz From 52e7d4865a9bd767fc4ef02f8ffdc9462017da81 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 1 Jul 2016 11:56:27 -0500 Subject: [PATCH 12/51] Use HTTPS in spec --- desktop-file-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index b0674b1..87e8bad 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -5,8 +5,8 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils 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 License: GPLv2+ Group: Development/Tools From f5cf9f2655919a3819f9aeae755c5feae28c7d7d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 31 Dec 2016 16:14:17 +0100 Subject: [PATCH 13/51] Add Pantheon to the list of desktop environments (#1333550, fdo#97385) * Sat Dec 31 2016 Kevin Kofler - 0.23-2 - Add Pantheon to the list of desktop environments (#1333550, fdo#97385) --- desktop-file-utils-0.23-add-pantheon.patch | 25 ++++++++++++++++++++++ desktop-file-utils.spec | 10 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 desktop-file-utils-0.23-add-pantheon.patch diff --git a/desktop-file-utils-0.23-add-pantheon.patch b/desktop-file-utils-0.23-add-pantheon.patch new file mode 100644 index 0000000..c420402 --- /dev/null +++ b/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/desktop-file-utils.spec b/desktop-file-utils.spec index 87e8bad..baf8fb3 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,10 +4,14 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 1%{?dist} +Release: 2%{?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 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 @@ -61,6 +66,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Dec 31 2016 Kevin Kofler - 0.23-2 +- Add Pantheon to the list of desktop environments (#1333550, fdo#97385) + * Fri Jul 01 2016 Michael Catanzaro - 0.23-1 - Update to 0.23 From 8b09dcec35eb34cc54b7c7a2dc78a33ccc3aaf6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:17:21 +0000 Subject: [PATCH 14/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index baf8fb3..4b25245 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 2%{?dist} +Release: 3%{?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 @@ -66,6 +66,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Dec 31 2016 Kevin Kofler - 0.23-2 - Add Pantheon to the list of desktop environments (#1333550, fdo#97385) From 2e96ba5aa0abe73b3b6e44a426715268850133f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:06:32 +0000 Subject: [PATCH 15/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 4b25245..d2cdbd0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 3%{?dist} +Release: 4%{?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 @@ -66,6 +66,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From a0de4e9657c171f53569fde06e950bcb1c82800a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:32:34 +0000 Subject: [PATCH 16/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index d2cdbd0..9c3b5d2 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 4%{?dist} +Release: 5%{?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 @@ -66,6 +66,9 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a98dda4413987cc531e47127e87f52980bc3ecac Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 5 Feb 2018 06:37:37 -0600 Subject: [PATCH 17/51] scriplets: silence output, ignore errors %license COPYING drop deprecated Group: tag --- desktop-file-utils.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 9c3b5d2..e6fe585 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 5%{?dist} +Release: 6%{?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 @@ -13,7 +13,6 @@ Source1: desktop-entry-mode-init.el # 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 BuildRequires: glib2-devel BuildRequires: emacs @@ -49,13 +48,14 @@ install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry- touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %transfiletriggerin -- %{_datadir}/applications -update-desktop-database +update-desktop-database &> /dev/null || : %transfiletriggerpostun -- %{_datadir}/applications -update-desktop-database +update-desktop-database &> /dev/null || : %files -%doc AUTHORS COPYING README NEWS +%doc AUTHORS README NEWS +%license COPYING %{_bindir}/* %{_mandir}/man1/desktop-file-install.1.gz %{_mandir}/man1/desktop-file-validate.1.gz @@ -66,6 +66,11 @@ update-desktop-database %{_emacs_sitelispdir}/%{pkg} %changelog +* Mon Feb 05 2018 Rex Dieter - 0.23-6 +- scriplets: silence output, ignore errors +- %%license COPYING +- drop deprecated Group: tag + * Wed Aug 02 2017 Fedora Release Engineering - 0.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 68b737c5b97bbd149a7b07bd2079d46de2c51c30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:41:58 +0000 Subject: [PATCH 18/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index e6fe585..3ca3577 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 6%{?dist} +Release: 7%{?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 @@ -66,6 +66,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Feb 05 2018 Rex Dieter - 0.23-6 - scriplets: silence output, ignore errors - %%license COPYING From 6af4353332e1f90f20b55e6780744dd49853b5ea Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 Apr 2018 14:49:55 -0700 Subject: [PATCH 19/51] Add 'font' as a valid media type (#1564650, fdo#105785) --- desktop-file-utils-0.23-font-media.patch | 30 ++++++++++++++++++++++++ desktop-file-utils.spec | 11 ++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 desktop-file-utils-0.23-font-media.patch diff --git a/desktop-file-utils-0.23-font-media.patch b/desktop-file-utils-0.23-font-media.patch new file mode 100644 index 0000000..c597c9a --- /dev/null +++ b/desktop-file-utils-0.23-font-media.patch @@ -0,0 +1,30 @@ +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.spec b/desktop-file-utils.spec index 3ca3577..d5bf395 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 7%{?dist} +Release: 8%{?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 @@ -12,6 +12,9 @@ Source1: desktop-entry-mode-init.el # 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 License: GPLv2+ BuildRequires: glib2-devel @@ -32,8 +35,7 @@ fixing it up in the process. %prep -%setup -q -%patch0 -p1 -b .add-pantheon +%autosetup -p1 %build %configure @@ -66,6 +68,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Mon Apr 09 2018 Adam Williamson - 0.23-8 +- Add 'font' as a valid media type (#1564650, fdo#105785) + * Wed Feb 07 2018 Fedora Release Engineering - 0.23-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d74a59c054c2220f25f79d61312e0d8b9e9f5d39 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:43 +0200 Subject: [PATCH 20/51] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- desktop-file-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index d5bf395..2bbacc7 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -17,6 +17,7 @@ Patch0: desktop-file-utils-0.23-add-pantheon.patch Patch1: desktop-file-utils-0.23-font-media.patch License: GPLv2+ +BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs Requires: emacs-filesystem From 95be12e05f96533da7f5d5da44bf94e03ed6e2bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:47:51 +0000 Subject: [PATCH 21/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 2bbacc7..35a9563 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 8%{?dist} +Release: 9%{?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 @@ -69,6 +69,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 09 2018 Adam Williamson - 0.23-8 - Add 'font' as a valid media type (#1564650, fdo#105785) From fe15ed6cf41223fd1506035a7c3d28248b3be5ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:06:41 +0000 Subject: [PATCH 22/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 35a9563..0f7de48 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 9%{?dist} +Release: 10%{?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 @@ -69,6 +69,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 0.23-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From abcac8c9210e64a550d6ec27bd8e5b0e2c4fca6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:51:52 +0000 Subject: [PATCH 23/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 0f7de48..8eac7c9 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.23 -Release: 10%{?dist} +Release: 11%{?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 @@ -69,6 +69,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.23-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.23-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 50f0dd1ced54d0b586e78d549362dd27527f7ef6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 14 Aug 2019 16:03:37 +0200 Subject: [PATCH 24/51] Update to 0.24 --- .gitignore | 1 + desktop-file-utils-0.23-add-pantheon.patch | 25 ------------------ desktop-file-utils-0.23-font-media.patch | 30 ---------------------- desktop-file-utils.spec | 14 ++++------ sources | 2 +- 5 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 desktop-file-utils-0.23-add-pantheon.patch delete mode 100644 desktop-file-utils-0.23-font-media.patch diff --git a/.gitignore b/.gitignore index 50c480a..a4ec089 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.21.tar.xz /desktop-file-utils-0.22.tar.xz /desktop-file-utils-0.23.tar.xz +/desktop-file-utils-0.24.tar.xz 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.spec b/desktop-file-utils.spec index 8eac7c9..7d0b0ea 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -3,18 +3,11 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.23 -Release: 11%{?dist} +Version: 0.24 +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 License: GPLv2+ BuildRequires: gcc @@ -69,6 +62,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Aug 14 2019 Kalev Lember - 0.24-1 +- Update to 0.24 + * Wed Jul 24 2019 Fedora Release Engineering - 0.23-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b3b4a1f..cb99021 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -599133d51cc9a41bfec186414906b6f1 desktop-file-utils-0.23.tar.xz +SHA512 (desktop-file-utils-0.24.tar.xz) = b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0 From 6c26cd31c2d2c5721803ebe44ccc21bdd9da316e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:42:03 +0000 Subject: [PATCH 25/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 7d0b0ea..616abcb 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.24 -Release: 1%{?dist} +Release: 2%{?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 @@ -62,6 +62,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Aug 14 2019 Kalev Lember - 0.24-1 - Update to 0.24 From c81297f7371758482c30b854093be39ca27345d0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:33:44 +0200 Subject: [PATCH 26/51] Update to 0.26 --- .gitignore | 1 + desktop-file-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a4ec089..b8e5c08 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.22.tar.xz /desktop-file-utils-0.23.tar.xz /desktop-file-utils-0.24.tar.xz +/desktop-file-utils-0.26.tar.xz diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 616abcb..5cda909 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -3,8 +3,8 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.24 -Release: 2%{?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 @@ -62,6 +62,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/%{pkg} %changelog +* Wed Jun 24 2020 Kalev Lember - 0.26-1 +- Update to 0.26 + * Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index cb99021..e43fa50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-file-utils-0.24.tar.xz) = b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0 +SHA512 (desktop-file-utils-0.26.tar.xz) = 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 From 5045b21efefc798573383bdb0f3cbaf15a57be12 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:35:05 +0200 Subject: [PATCH 27/51] Simplify macros usage --- desktop-file-utils.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 5cda909..e5c556e 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,6 +1,3 @@ -%global pkg desktop-file-utils -%global pkgname desktop-file-utils - Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 @@ -14,10 +11,10 @@ BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs 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 +Provides: emacs-desktop-file-utils = %{version}-%{release} +Provides: emacs-desktop-file-utils-el = %{version}-%{release} +Obsoletes: emacs-desktop-file-utils < 0.20-3 +Obsoletes: emacs-desktop-file-utils-el < 0.20-3 %description .desktop files are used to describe an application for inclusion in @@ -38,8 +35,8 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -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}/desktop-file-utils +mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils 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,7 +56,7 @@ update-desktop-database &> /dev/null || : %{_mandir}/man1/desktop-file-edit.1.gz %{_emacs_sitestartdir}/desktop-entry-mode-init.el %ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc -%{_emacs_sitelispdir}/%{pkg} +%{_emacs_sitelispdir}/desktop-file-utils/ %changelog * Wed Jun 24 2020 Kalev Lember - 0.26-1 From e75cbaeb2f8262c037fc46f5a24f85072872151b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:36:08 +0200 Subject: [PATCH 28/51] Avoid hardcoding man page extensions --- desktop-file-utils.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index e5c556e..a05416f 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -50,10 +50,10 @@ 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}/desktop-file-utils/ @@ -61,6 +61,7 @@ update-desktop-database &> /dev/null || : %changelog * Wed Jun 24 2020 Kalev Lember - 0.26-1 - Update to 0.26 +- Avoid hardcoding man page extensions * Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b4bb9cf49fb568731de3674115efe3ecb7cb7be4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:36:51 +0200 Subject: [PATCH 29/51] Fix whitespace --- desktop-file-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index a05416f..9559101 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -7,7 +7,7 @@ Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name Source1: desktop-entry-mode-init.el License: GPLv2+ -BuildRequires: gcc +BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs Requires: emacs-filesystem From 7bbb630d9a26bd1ee83241b5a97c2b6594b5b546 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:42:28 +0200 Subject: [PATCH 30/51] Switch to the meson build system --- desktop-file-utils.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 9559101..6b50aaf 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -10,6 +10,7 @@ License: GPLv2+ BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: emacs +BuildRequires: meson Requires: emacs-filesystem Provides: emacs-desktop-file-utils = %{version}-%{release} Provides: emacs-desktop-file-utils-el = %{version}-%{release} @@ -29,11 +30,11 @@ 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}/desktop-file-utils mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils @@ -61,6 +62,7 @@ update-desktop-database &> /dev/null || : %changelog * Wed Jun 24 2020 Kalev Lember - 0.26-1 - Update to 0.26 +- Switch to the meson build system - Avoid hardcoding man page extensions * Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 From ac3b81f83d6ed1b14ea154a7e0cc6b00c6b03402 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 24 Jun 2020 11:47:45 +0200 Subject: [PATCH 31/51] Drop old emacs-desktop-file-utils obsoletes/provides --- desktop-file-utils.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 6b50aaf..b873a18 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -12,10 +12,6 @@ BuildRequires: glib2-devel BuildRequires: emacs BuildRequires: meson Requires: emacs-filesystem -Provides: emacs-desktop-file-utils = %{version}-%{release} -Provides: emacs-desktop-file-utils-el = %{version}-%{release} -Obsoletes: emacs-desktop-file-utils < 0.20-3 -Obsoletes: emacs-desktop-file-utils-el < 0.20-3 %description .desktop files are used to describe an application for inclusion in @@ -64,6 +60,7 @@ update-desktop-database &> /dev/null || : - Update to 0.26 - Switch to the meson build system - Avoid hardcoding man page extensions +- Drop old emacs-desktop-file-utils obsoletes/provides * Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 24c3746a9eec7b976562377aa792243e3dc9afe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:16:47 +0000 Subject: [PATCH 32/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index b873a18..acc3dd5 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 1%{?dist} +Release: 2%{?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 @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 24 2020 Kalev Lember - 0.26-1 - Update to 0.26 - Switch to the meson build system From c9cb980500915211fe005fdc351931b7f67681bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:16:35 +0000 Subject: [PATCH 33/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index acc3dd5..f60409d 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 2%{?dist} +Release: 3%{?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 @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2e932a2875b5c32a1d162a96470204c737d071cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:40:18 +0000 Subject: [PATCH 34/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index f60409d..08298f0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 3%{?dist} +Release: 4%{?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 @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e62a46bad2dba26a247907cf983a8dda90f650b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:32:38 +0000 Subject: [PATCH 35/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 08298f0..366902f 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 4%{?dist} +Release: 5%{?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 @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dd31fa832961a07391d534fc1f52f6d5c63ad945 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 15 Feb 2022 11:12:13 +0000 Subject: [PATCH 36/51] Support files conforming to 1.5 of the specification (#2053905) --- desktop-file-utils-0.26-support-1.5.patch | 83 +++++++++++++++++++++++ desktop-file-utils.spec | 7 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 desktop-file-utils-0.26-support-1.5.patch diff --git a/desktop-file-utils-0.26-support-1.5.patch b/desktop-file-utils-0.26-support-1.5.patch new file mode 100644 index 0000000..1e350ed --- /dev/null +++ b/desktop-file-utils-0.26-support-1.5.patch @@ -0,0 +1,83 @@ +From 48586dd1a755a80ec8ce0e8151b3ba236d81502f Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 15 Feb 2022 10:54:40 +0000 +Subject: [PATCH 1/2] Add support for 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.34.1 + + +From e3e21bccfe257aa2a34d64a68582dcc2363c2606 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.34.1 + diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 366902f..a57cc5c 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,10 +1,12 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 5%{?dist} +Release: 6%{?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 +# https://bugzilla.redhat.com/show_bug.cgi?id=2053905 +Patch0: desktop-file-utils-0.26-support-1.5.patch License: GPLv2+ BuildRequires: gcc @@ -56,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Tue Feb 15 2022 David King - 0.26-6 +- Support files conforming to 1.5 of the specification (#2053905) + * Thu Jan 20 2022 Fedora Release Engineering - 0.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4bcdd33bb0b23d3b83892c2c5b1a5930ca68c0c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:19:58 +0000 Subject: [PATCH 37/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index a57cc5c..2d94811 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 6%{?dist} +Release: 7%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Feb 15 2022 David King - 0.26-6 - Support files conforming to 1.5 of the specification (#2053905) From a5cdce7454e7cfd51dc80730a5f6eb1321be8143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:16:18 +0000 Subject: [PATCH 38/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 2d94811..0ecc160 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 7%{?dist} +Release: 8%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.26-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1e3cb35021e3935cdcb9791058b84ac0e565a360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:18:01 +0000 Subject: [PATCH 39/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 0ecc160..b8b1c13 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 8%{?dist} +Release: 9%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.26-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9b79e22a29b6a8bb48d967f6c92a31f963e8a268 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:02:16 +0000 Subject: [PATCH 40/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index b8b1c13..f376f91 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 9%{?dist} +Release: 10%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.26-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.26-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 12f8a72b30dedf0ec3a98b633906210232bdee8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:19:11 +0000 Subject: [PATCH 41/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index f376f91..372ff48 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 10%{?dist} +Release: 11%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.26-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 357ec870d61da9f58f6c0da73baa686fd9df8335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 5 Feb 2024 15:45:04 +0000 Subject: [PATCH 42/51] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_3 --- desktop-file-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 372ff48..2a9f819 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -7,7 +7,7 @@ Source0: https://www.freedesktop.org/software/desktop-file-utils/releases/%{name Source1: desktop-entry-mode-init.el # https://bugzilla.redhat.com/show_bug.cgi?id=2053905 Patch0: desktop-file-utils-0.26-support-1.5.patch -License: GPLv2+ +License: GPL-2.0-or-later BuildRequires: gcc BuildRequires: glib2-devel From 571367a29cefba8602126a58b1d7c43f8e2dbb6e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 12 Feb 2024 10:56:18 +0100 Subject: [PATCH 43/51] Build for the SPDX license format change --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 2a9f819..468fcb8 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 11%{?dist} +Release: 12%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Mon Jan 12 2024 Tomas Popela - 0.26-12 +- Build for the SPDX license format change + * Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 934315eee8d60b24c80672e91e7ebed62cc6ea05 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 12 Feb 2024 10:57:00 +0100 Subject: [PATCH 44/51] Fix the bogus date in my last commit --- desktop-file-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 468fcb8..16b927b 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -58,7 +58,7 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog -* Mon Jan 12 2024 Tomas Popela - 0.26-12 +* Mon Feb 12 2024 Tomas Popela - 0.26-12 - Build for the SPDX license format change * Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 From 9eca11add4dfed63c778e70a09b9976422571ade Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:50:51 +0000 Subject: [PATCH 45/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 16b927b..e3df228 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.26 -Release: 12%{?dist} +Release: 13%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.26-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Feb 12 2024 Tomas Popela - 0.26-12 - Build for the SPDX license format change From b5d43d787431c47ea52b414c8c1b3535d15d2113 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 22 Jul 2024 20:32:27 -0400 Subject: [PATCH 46/51] Rebase to 0.27 --- .gitignore | 1 + desktop-file-utils-0.26-support-1.5.patch | 83 ----------------------- desktop-file-utils.spec | 9 +-- sources | 2 +- 4 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 desktop-file-utils-0.26-support-1.5.patch diff --git a/.gitignore b/.gitignore index b8e5c08..ace22bd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.23.tar.xz /desktop-file-utils-0.24.tar.xz /desktop-file-utils-0.26.tar.xz +/desktop-file-utils-0.27.tar.xz diff --git a/desktop-file-utils-0.26-support-1.5.patch b/desktop-file-utils-0.26-support-1.5.patch deleted file mode 100644 index 1e350ed..0000000 --- a/desktop-file-utils-0.26-support-1.5.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 48586dd1a755a80ec8ce0e8151b3ba236d81502f Mon Sep 17 00:00:00 2001 -From: David King -Date: Tue, 15 Feb 2022 10:54:40 +0000 -Subject: [PATCH 1/2] Add support for 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.34.1 - - -From e3e21bccfe257aa2a34d64a68582dcc2363c2606 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.34.1 - diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index e3df228..1012b85 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,12 +1,10 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.26 -Release: 13%{?dist} +Version: 0.27 +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 -# https://bugzilla.redhat.com/show_bug.cgi?id=2053905 -Patch0: desktop-file-utils-0.26-support-1.5.patch License: GPL-2.0-or-later BuildRequires: gcc @@ -58,6 +56,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Tue Jul 23 2024 Neal Gompa - 0.27-1 +- Rebase to 0.27 + * Wed Jul 17 2024 Fedora Release Engineering - 0.26-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e43fa50..8ed0639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-file-utils-0.26.tar.xz) = 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 +SHA512 (desktop-file-utils-0.27.tar.xz) = 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 From c6a3da2f5267bc73f6b2065a32017b223570ab6b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Sat, 20 Jul 2024 17:56:00 +0000 Subject: [PATCH 47/51] patch: add cosmic category patch Signed-off-by: Ryan Brue --- 0001-validate-add-COSMIC.patch | 34 ++++++++++++++++++++++++++++++++++ desktop-file-utils.spec | 7 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-validate-add-COSMIC.patch diff --git a/0001-validate-add-COSMIC.patch b/0001-validate-add-COSMIC.patch new file mode 100644 index 0000000..815253f --- /dev/null +++ b/0001-validate-add-COSMIC.patch @@ -0,0 +1,34 @@ +From 67d09f0c851cfaf0ff3ae8689c14a09ec08d6fa1 Mon Sep 17 00:00:00 2001 +From: Ryan Brue +Date: Sat, 20 Jul 2024 15:35:57 +0000 +Subject: [PATCH] validate: add COSMIC + +Signed-off-by: Ryan Brue +--- + src/validate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/validate.c b/src/validate.c +index 149ccbe..3ccf866 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -386,7 +386,7 @@ static DesktopKeyDefinition registered_action_keys[] = { + + /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ + static const char *show_in_registered[] = { +- "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" ++ "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" + }; + + static struct { +@@ -540,6 +540,7 @@ static struct { + { "Documentation", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Adult", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "Core", FALSE, FALSE, FALSE, { NULL }, { NULL } }, ++ { "COSMIC", FALSE, FALSE, FALSE, { NULL }, { NULL } }, + { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, +-- +2.45.2 + diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 1012b85..db23bf7 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,10 +1,12 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.27 -Release: 1%{?dist} +Release: 2%{?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 +# Patch is from https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/22 +Patch0: 0001-validate-add-COSMIC.patch License: GPL-2.0-or-later BuildRequires: gcc @@ -56,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Tue Jul 23 2024 Ryan Brue - 0.27-2 +- Add patch to include COSMIC as a category + * Tue Jul 23 2024 Neal Gompa - 0.27-1 - Rebase to 0.27 From 9b8c14ab5ae0631a5092cabe7269b4076f50204d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:36:14 +0000 Subject: [PATCH 48/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index db23bf7..2bfea9c 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.27 -Release: 2%{?dist} +Release: 3%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jul 23 2024 Ryan Brue - 0.27-2 - Add patch to include COSMIC as a category From b08516ebbce0c577669cb455e2906f9cfc038ea1 Mon Sep 17 00:00:00 2001 From: Sam Day Date: Fri, 31 Jan 2025 15:50:59 +0100 Subject: [PATCH 49/51] 0.28 update Drop COSMIC patch, it landed upstream in 0.28 Add patch to recognize Phosh as a valid OnlyShowIn= environment Signed-off-by: Sam Day --- .gitignore | 1 + ...sh-to-list-of-valid-OnlyShowIn-envir.patch | 28 +++++++++---------- desktop-file-utils.spec | 13 ++++++--- sources | 2 +- 4 files changed, 25 insertions(+), 19 deletions(-) rename 0001-validate-add-COSMIC.patch => 0001-validate-Add-Phosh-to-list-of-valid-OnlyShowIn-envir.patch (50%) diff --git a/.gitignore b/.gitignore index ace22bd..57dc82a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ desktop-file-utils-0.16.tar.bz2 /desktop-file-utils-0.24.tar.xz /desktop-file-utils-0.26.tar.xz /desktop-file-utils-0.27.tar.xz +/desktop-file-utils-0.28.tar.xz diff --git a/0001-validate-add-COSMIC.patch b/0001-validate-Add-Phosh-to-list-of-valid-OnlyShowIn-envir.patch similarity index 50% rename from 0001-validate-add-COSMIC.patch rename to 0001-validate-Add-Phosh-to-list-of-valid-OnlyShowIn-envir.patch index 815253f..d6380cb 100644 --- a/0001-validate-add-COSMIC.patch +++ b/0001-validate-Add-Phosh-to-list-of-valid-OnlyShowIn-envir.patch @@ -1,34 +1,34 @@ -From 67d09f0c851cfaf0ff3ae8689c14a09ec08d6fa1 Mon Sep 17 00:00:00 2001 -From: Ryan Brue -Date: Sat, 20 Jul 2024 15:35:57 +0000 -Subject: [PATCH] validate: add COSMIC +From 673ec76e881b8dd7f710b846ae0418c09e6f5439 Mon Sep 17 00:00:00 2001 +From: Sam Day +Date: Fri, 31 Jan 2025 14:50:21 +0100 +Subject: [PATCH] validate: Add Phosh to list of valid OnlyShowIn= environments -Signed-off-by: Ryan Brue +Signed-off-by: Sam Day --- src/validate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/validate.c b/src/validate.c -index 149ccbe..3ccf866 100644 +index 3ccf866..89a17de 100644 --- a/src/validate.c +++ b/src/validate.c @@ -386,7 +386,7 @@ static DesktopKeyDefinition registered_action_keys[] = { /* This should be the same list as in xdg-specs/menu/menu-spec.xml */ static const char *show_in_registered[] = { -- "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" -+ "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" +- "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" ++ "COSMIC", "GNOME", "GNOME-Classic", "GNOME-Flashback", "KDE", "LXDE", "LXQt", "MATE", "Phosh", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Budgie", "Enlightenment", "DDE", "Endless", "Old" }; static struct { -@@ -540,6 +540,7 @@ static struct { - { "Documentation", FALSE, FALSE, FALSE, { NULL }, { NULL } }, - { "Adult", FALSE, FALSE, FALSE, { NULL }, { NULL } }, - { "Core", FALSE, FALSE, FALSE, { NULL }, { NULL } }, -+ { "COSMIC", FALSE, FALSE, FALSE, { NULL }, { NULL } }, +@@ -543,6 +543,7 @@ static struct { + { "COSMIC", FALSE, FALSE, FALSE, { NULL }, { NULL } }, { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, ++ { "Phosh", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } }, + { "DDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, + { "LXQt", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } }, -- -2.45.2 +2.47.1 diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 2bfea9c..8a5ed1c 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,12 +1,12 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.27 -Release: 3%{?dist} +Version: 0.28 +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 -# Patch is from https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/22 -Patch0: 0001-validate-add-COSMIC.patch +# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/24 +Patch0: 0001-validate-Add-Phosh-to-list-of-valid-OnlyShowIn-envir.patch License: GPL-2.0-or-later BuildRequires: gcc @@ -58,6 +58,11 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Fri Jan 31 2025 Sam Day - 0.28-1 + - 0.28 update + - Drop COSMIC patch, it landed upstream in 0.28 + - Add patch to recognize Phosh as a valid OnlyShowIn= environment + * Thu Jan 16 2025 Fedora Release Engineering - 0.27-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 8ed0639..0022540 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-file-utils-0.27.tar.xz) = 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 +SHA512 (desktop-file-utils-0.28.tar.xz) = 1024172fcd37ace0660fd58195c0562b47f1ef8ed37f662b88048c295a388d1458d01f86799b34ec9e8b27a7ea441f98665f0d641c29cb5ecc3abd7da41230f0 From cc349fbe8e909f83f5c1bf7608bf1dcea6955038 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:12:24 +0000 Subject: [PATCH 50/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 8a5ed1c..e764442 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.28 -Release: 1%{?dist} +Release: 2%{?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 @@ -58,6 +58,9 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 31 2025 Sam Day - 0.28-1 - 0.28 update - Drop COSMIC patch, it landed upstream in 0.28 From a30e10b0b5cf54fa02dc4720bfc8d26ad8efd840 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 19 Nov 2025 18:58:35 +0100 Subject: [PATCH 51/51] Convert to %autorelease and %autochangelog ... using 'rpmautospec convert'. [skip changelog] --- changelog | 395 +++++++++++++++++++++++++++++++++++++++ desktop-file-utils.spec | 398 +--------------------------------------- 2 files changed, 397 insertions(+), 396 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..602d467 --- /dev/null +++ b/changelog @@ -0,0 +1,395 @@ +* Wed Jul 23 2025 Fedora Release Engineering - 0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 31 2025 Sam Day - 0.28-1 + - 0.28 update + - Drop COSMIC patch, it landed upstream in 0.28 + - Add patch to recognize Phosh as a valid OnlyShowIn= environment + +* Thu Jan 16 2025 Fedora Release Engineering - 0.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jul 23 2024 Ryan Brue - 0.27-2 +- Add patch to include COSMIC as a category + +* Tue Jul 23 2024 Neal Gompa - 0.27-1 +- Rebase to 0.27 + +* Wed Jul 17 2024 Fedora Release Engineering - 0.26-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Feb 12 2024 Tomas Popela - 0.26-12 +- Build for the SPDX license format change + +* Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.26-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 0.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.26-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Feb 15 2022 David King - 0.26-6 +- Support files conforming to 1.5 of the specification (#2053905) + +* Thu Jan 20 2022 Fedora Release Engineering - 0.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 0.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jun 24 2020 Kalev Lember - 0.26-1 +- Update to 0.26 +- Switch to the meson build system +- Avoid hardcoding man page extensions +- Drop old emacs-desktop-file-utils obsoletes/provides + +* Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Aug 14 2019 Kalev Lember - 0.24-1 +- Update to 0.24 + +* Wed Jul 24 2019 Fedora Release Engineering - 0.23-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 0.23-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0.23-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 09 2018 Adam Williamson - 0.23-8 +- Add 'font' as a valid media type (#1564650, fdo#105785) + +* Wed Feb 07 2018 Fedora Release Engineering - 0.23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Rex Dieter - 0.23-6 +- scriplets: silence output, ignore errors +- %%license COPYING +- drop deprecated Group: tag + +* Wed Aug 02 2017 Fedora Release Engineering - 0.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Dec 31 2016 Kevin Kofler - 0.23-2 +- Add Pantheon to the list of desktop environments (#1333550, fdo#97385) + +* Fri Jul 01 2016 Michael Catanzaro - 0.23-1 +- Update to 0.23 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.22-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 14 2015 Matthias Clasen - 0.22-6 +- Add file triggers for desktop file mime extraction + +* Wed Jun 17 2015 Fedora Release Engineering - 0.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 0.22-4 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Sat Aug 16 2014 Fedora Release Engineering - 0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 29 2013 Kalev Lember - 0.22-1 +- Update to 0.22 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Oct 19 2012 Kalev Lember - 0.21-1 +- Update to 0.21 + +* Thu Sep 06 2012 Dan Mashal 0.20-4 +- Update F17 to 0.20 (#847097). + +* Sat Aug 11 2012 Ville Skyttä - 0.20-3 +- Fold emacs-* subpackages into main (#690264). + +* Wed Jul 18 2012 Fedora Release Engineering - 0.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri May 18 2012 Matthias Clasen - 0.20-1 +- Update to 0.20 + +* Fri Jan 13 2012 Fedora Release Engineering - 0.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 23 2011 Matthias Clasen - 0.19-5 +- Fix up locale lists just like other lists + +* Tue Dec 20 2011 Matthias Clasen - 0.19-1 +- Update to 0.19: support for Unity as desktop env, and support + for Keywords + +* Mon Jul 04 2011 Adam Williamson - 0.18-4 +- add unity.patch from upstream: add Unity to list of registered + environments + +* Tue Feb 08 2011 Fedora Release Engineering - 0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jan 30 2011 Ville Skyttä - 0.18-2 +- Add desktop-entry-mode-init.el, fix emacs site-start dir ownership. + +* Thu Jan 13 2011 Matthias Clasen - 0.18-1 +- Update to 0.18 + +* Fri Nov 5 2010 Matthias Clasen - 0.16-3 +- Don't warn about x-scheme-handler pseudo-mime-types + +* Sat Sep 25 2010 Parag Nemade - 0.16-2 +- Merge-review cleanup (#225681) + +* Thu Apr 1 2010 Matthias Clasen 0.16-1 +- Update to 0.16 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Richard Hughes - 0.15-6 +- Panu seems to be shipping the prov file in rpmbuild. Remove it here until we + work out where it belongs. + +* Wed Feb 04 2009 Richard Hughes - 0.15-5 +- Panu merged the rpm bits for this feature, but we've got a new provides + filename. Respin this package with the new name. + +* Thu Jan 22 2009 Richard Hughes - 0.15-4 +- Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny + macros.desktop_mime_type file so that we can trivially patch rpm to enable + this new functionality. + +* Fri May 02 2008 Richard Hughes - 0.15-3 +- Add desktop-mime-type.prov so that we can automatically + generate mimetype provides for packages at build time. + This lets us do some cool things with PackageKit in the future. + +* Wed Mar 19 2008 Ray Strode - 0.15-2 +- Drop old unneeded obsoletes on desktop-file-validator +(bug 225681) + +* Tue Mar 4 2008 Matthias Clasen - 0.15-1 +- Update to 0.15 +- Drop upstreamed patch + +* Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 +- Autorebuild for GCC 4.3 + +* Thu Dec 6 2007 Ray Strode 0.14-2 +- make icon extension a warning not an error + +* Fri Nov 30 2007 Christopher Stone 0.14-1 +- Upstream sync +- Remove no longer needed short option patch + +* Wed Aug 15 2007 Matthias Clasen - 0.13-3 +- Make the -m option work (#232761) + +* Mon Aug 6 2007 Matthias Clasen - 0.13-2 +- Update license field + +* Tue Jun 5 2007 Matthias Clasen - 0.13-1 +- Update to 0.13, which features a completely rewritten validator + +* Thu Mar 08 2007 Florian La Roche - 0.12-4 +- remove empty post/preun scripts completely + +* Tue Nov 28 2006 Ray Strode - 0.12-3 +- drop some rm -f cruft +- don't call update-desktop-database from %%post or %%postun + +* Tue Nov 28 2006 Ray Strode - 0.12-2 +- make --vendor optional + +* Tue Nov 28 2006 Ray Strode - 0.12-1 +- Update to 0.12 + +* Fri Oct 27 2006 Ray Strode - 0.11-4 +- commit the fix attempted in 0.11-2 and 0.11-3 to the right + function... + +* Fri Oct 27 2006 Ray Strode - 0.11-3 +- actually apply the patch written in 0.11-2 + +* Thu Oct 26 2006 Ray Strode - 0.11-2 +- make desktop file validation non-fatal until we + add support for categories beginning with X- and clean up + our menu system to not require invalid categories + (bug 212048) + +* Mon Oct 23 2006 Matthias Clasen - 0.11-1 +- Update to 0.11 + +* Wed Jul 26 2006 Jesse Keating - 0.10-7 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 0.10-6.1 +- bump again for double-long bug on ppc(64) + +* Fri Feb 10 2006 Ray Strode - 0.10-6 +- call update-desktop-database in %%preun (bug 180898) +- don't fail if update-desktop-database fails +- don't use %%makeinstall + +* Fri Feb 10 2006 Ray Strode - 0.10-5 +- call update-desktop-database in %%post (bug 180898) + +* Tue Feb 07 2006 Jesse Keating - 0.10-4.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Sun Jan 22 2006 Ray Strode - 0.10-4 +- don't use uninitialized memory (bug 178591) + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Aug 31 2005 Ray Strode - 0.10-3 +- bump build requires for glib to 2.2.0 (bug #146585). + +* Thu May 12 2005 Ray Strode - 0.10-2 +- Add build requires for emacs (bug #141297). + +* Wed Jan 26 2005 Matthias Clasen - 0.10-1 +- Update to 0.10 + +* Mon Oct 18 2004 Miloslav Trmac - 0.9-2 +- Output error message instead of assertion failure (#134934) + +* Tue Sep 28 2004 Mark McLoughlin 0.9-1 +- Update to 0.9, remove upstreamed patches + +* Mon Sep 27 2004 Ray Strode 0.8-6 +- Swap if and else in egg_desktop_entries_get_locale_encoding + to prevent allocating massive amounts of unneeded ram. + +* Mon Sep 27 2004 Ray Strode 0.8-5 +- Swap if and else in egg_desktop_entries_get_locale_country + to prevent allocating massive amounts of unneeded ram. + +* Thu Sep 23 2004 Ray Strode 0.8-4 +- Fix the fix for --remove-show-in option + +* Thu Sep 23 2004 Ray Strode 0.8-3 +- Fix --remove-show-in option + +* Mon Sep 13 2004 Dan Williams 0.8-2 +- Fix RH #131983 (annoying log message about "entries != NULL") + +* Fri Sep 3 2004 Mark McLoughlin 0.8-1 +- Update to 0.8 + +* Sat Jul 31 2004 Dan Williams 0.7-1 +- Update to 0.7 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Mar 1 2004 Dan Williams 0.4-2 +- Fix RH #117201, initial comment fails validation +- Add in, but do not use, Frederic Crozat's freedesktop.org + menu-spec 0.8 patch + +* Thu Feb 19 2004 Mark McLoughlin 0.4-1 +- Update to 0.4 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Sep 3 2003 Havoc Pennington 0.3-10 +- fix for #103276 (int/size_t issue) from twoerner + +* Mon Jul 7 2003 Alexander Larsson 0.3-9 +- Rebuild + +* Mon Jun 23 2003 Havoc Pennington 0.3-8 +- rebuild + +* Thu Jun 5 2003 Jonathan Blandford 0.3-6 +- Backport patch to allow @MODIFIER in locale keys + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 6 2002 Havoc Pennington +- rebuild + +* Tue Aug 6 2002 Havoc Pennington +- fix more error messages + +* Tue Aug 6 2002 Havoc Pennington +- remove old symlinks before creating new ones, chills out + a lot of error messages + +* Tue Aug 6 2002 Havoc Pennington +- version 0.3 + +* Wed Jul 24 2002 Havoc Pennington +- 0.2.95 cvs snap, should fix OnlyShowIn + +* Mon Jul 22 2002 Havoc Pennington +- 0.2.94 cvs snap, adds --print-available + +* Tue Jul 9 2002 Havoc Pennington +- 0.2.93 cvs snap with a crash fixed, and corrects [KDE Desktop Entry] + +* Fri Jun 21 2002 Havoc Pennington +- 0.2.92 cvs snap with --remove-key and checking for OnlyShowIn + and missing trailing semicolons on string lists + +* Fri Jun 21 2002 Havoc Pennington +- 0.2.91 cvs snap with --copy-name-to-generic-name and + --copy-generic-name-to-name + +* Sun Jun 16 2002 Havoc Pennington +- 0.2.90 cvs snap with --delete-original fixed + +* Fri Jun 07 2002 Havoc Pennington +- rebuild in different environment + +* Wed Jun 5 2002 Havoc Pennington +- 0.2 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu May 09 2002 Havoc Pennington +- rebuild in different environment + +* Thu May 9 2002 Havoc Pennington +- initial build diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index e764442..984c744 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.28 -Release: 2%{?dist} +Release: %autorelease 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 @@ -58,398 +58,4 @@ update-desktop-database &> /dev/null || : %{_emacs_sitelispdir}/desktop-file-utils/ %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 0.28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 31 2025 Sam Day - 0.28-1 - - 0.28 update - - Drop COSMIC patch, it landed upstream in 0.28 - - Add patch to recognize Phosh as a valid OnlyShowIn= environment - -* Thu Jan 16 2025 Fedora Release Engineering - 0.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jul 23 2024 Ryan Brue - 0.27-2 -- Add patch to include COSMIC as a category - -* Tue Jul 23 2024 Neal Gompa - 0.27-1 -- Rebase to 0.27 - -* Wed Jul 17 2024 Fedora Release Engineering - 0.26-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Feb 12 2024 Tomas Popela - 0.26-12 -- Build for the SPDX license format change - -* Wed Jan 24 2024 Fedora Release Engineering - 0.26-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.26-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.26-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.26-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.26-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Feb 15 2022 David King - 0.26-6 -- Support files conforming to 1.5 of the specification (#2053905) - -* Thu Jan 20 2022 Fedora Release Engineering - 0.26-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.26-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jun 24 2020 Kalev Lember - 0.26-1 -- Update to 0.26 -- Switch to the meson build system -- Avoid hardcoding man page extensions -- Drop old emacs-desktop-file-utils obsoletes/provides - -* Tue Jan 28 2020 Fedora Release Engineering - 0.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 14 2019 Kalev Lember - 0.24-1 -- Update to 0.24 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.23-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.23-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.23-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 09 2018 Adam Williamson - 0.23-8 -- Add 'font' as a valid media type (#1564650, fdo#105785) - -* Wed Feb 07 2018 Fedora Release Engineering - 0.23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Feb 05 2018 Rex Dieter - 0.23-6 -- scriplets: silence output, ignore errors -- %%license COPYING -- drop deprecated Group: tag - -* Wed Aug 02 2017 Fedora Release Engineering - 0.23-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Dec 31 2016 Kevin Kofler - 0.23-2 -- Add Pantheon to the list of desktop environments (#1333550, fdo#97385) - -* Fri Jul 01 2016 Michael Catanzaro - 0.23-1 -- Update to 0.23 - -* Wed Feb 03 2016 Fedora Release Engineering - 0.22-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Aug 14 2015 Matthias Clasen - 0.22-6 -- Add file triggers for desktop file mime extraction - -* Wed Jun 17 2015 Fedora Release Engineering - 0.22-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 0.22-4 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Sat Aug 16 2014 Fedora Release Engineering - 0.22-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Aug 29 2013 Kalev Lember - 0.22-1 -- Update to 0.22 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Oct 19 2012 Kalev Lember - 0.21-1 -- Update to 0.21 - -* Thu Sep 06 2012 Dan Mashal 0.20-4 -- Update F17 to 0.20 (#847097). - -* Sat Aug 11 2012 Ville Skyttä - 0.20-3 -- Fold emacs-* subpackages into main (#690264). - -* Wed Jul 18 2012 Fedora Release Engineering - 0.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri May 18 2012 Matthias Clasen - 0.20-1 -- Update to 0.20 - -* Fri Jan 13 2012 Fedora Release Engineering - 0.19-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Dec 23 2011 Matthias Clasen - 0.19-5 -- Fix up locale lists just like other lists - -* Tue Dec 20 2011 Matthias Clasen - 0.19-1 -- Update to 0.19: support for Unity as desktop env, and support - for Keywords - -* Mon Jul 04 2011 Adam Williamson - 0.18-4 -- add unity.patch from upstream: add Unity to list of registered - environments - -* Tue Feb 08 2011 Fedora Release Engineering - 0.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jan 30 2011 Ville Skyttä - 0.18-2 -- Add desktop-entry-mode-init.el, fix emacs site-start dir ownership. - -* Thu Jan 13 2011 Matthias Clasen - 0.18-1 -- Update to 0.18 - -* Fri Nov 5 2010 Matthias Clasen - 0.16-3 -- Don't warn about x-scheme-handler pseudo-mime-types - -* Sat Sep 25 2010 Parag Nemade - 0.16-2 -- Merge-review cleanup (#225681) - -* Thu Apr 1 2010 Matthias Clasen 0.16-1 -- Update to 0.16 - -* Fri Jul 24 2009 Fedora Release Engineering - 0.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 0.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Richard Hughes - 0.15-6 -- Panu seems to be shipping the prov file in rpmbuild. Remove it here until we - work out where it belongs. - -* Wed Feb 04 2009 Richard Hughes - 0.15-5 -- Panu merged the rpm bits for this feature, but we've got a new provides - filename. Respin this package with the new name. - -* Thu Jan 22 2009 Richard Hughes - 0.15-4 -- Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny - macros.desktop_mime_type file so that we can trivially patch rpm to enable - this new functionality. - -* Fri May 02 2008 Richard Hughes - 0.15-3 -- Add desktop-mime-type.prov so that we can automatically - generate mimetype provides for packages at build time. - This lets us do some cool things with PackageKit in the future. - -* Wed Mar 19 2008 Ray Strode - 0.15-2 -- Drop old unneeded obsoletes on desktop-file-validator -(bug 225681) - -* Tue Mar 4 2008 Matthias Clasen - 0.15-1 -- Update to 0.15 -- Drop upstreamed patch - -* Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 -- Autorebuild for GCC 4.3 - -* Thu Dec 6 2007 Ray Strode 0.14-2 -- make icon extension a warning not an error - -* Fri Nov 30 2007 Christopher Stone 0.14-1 -- Upstream sync -- Remove no longer needed short option patch - -* Wed Aug 15 2007 Matthias Clasen - 0.13-3 -- Make the -m option work (#232761) - -* Mon Aug 6 2007 Matthias Clasen - 0.13-2 -- Update license field - -* Tue Jun 5 2007 Matthias Clasen - 0.13-1 -- Update to 0.13, which features a completely rewritten validator - -* Thu Mar 08 2007 Florian La Roche - 0.12-4 -- remove empty post/preun scripts completely - -* Tue Nov 28 2006 Ray Strode - 0.12-3 -- drop some rm -f cruft -- don't call update-desktop-database from %%post or %%postun - -* Tue Nov 28 2006 Ray Strode - 0.12-2 -- make --vendor optional - -* Tue Nov 28 2006 Ray Strode - 0.12-1 -- Update to 0.12 - -* Fri Oct 27 2006 Ray Strode - 0.11-4 -- commit the fix attempted in 0.11-2 and 0.11-3 to the right - function... - -* Fri Oct 27 2006 Ray Strode - 0.11-3 -- actually apply the patch written in 0.11-2 - -* Thu Oct 26 2006 Ray Strode - 0.11-2 -- make desktop file validation non-fatal until we - add support for categories beginning with X- and clean up - our menu system to not require invalid categories - (bug 212048) - -* Mon Oct 23 2006 Matthias Clasen - 0.11-1 -- Update to 0.11 - -* Wed Jul 26 2006 Jesse Keating - 0.10-7 -- rebuild - -* Fri Feb 10 2006 Jesse Keating - 0.10-6.1 -- bump again for double-long bug on ppc(64) - -* Fri Feb 10 2006 Ray Strode - 0.10-6 -- call update-desktop-database in %%preun (bug 180898) -- don't fail if update-desktop-database fails -- don't use %%makeinstall - -* Fri Feb 10 2006 Ray Strode - 0.10-5 -- call update-desktop-database in %%post (bug 180898) - -* Tue Feb 07 2006 Jesse Keating - 0.10-4.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Sun Jan 22 2006 Ray Strode - 0.10-4 -- don't use uninitialized memory (bug 178591) - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Aug 31 2005 Ray Strode - 0.10-3 -- bump build requires for glib to 2.2.0 (bug #146585). - -* Thu May 12 2005 Ray Strode - 0.10-2 -- Add build requires for emacs (bug #141297). - -* Wed Jan 26 2005 Matthias Clasen - 0.10-1 -- Update to 0.10 - -* Mon Oct 18 2004 Miloslav Trmac - 0.9-2 -- Output error message instead of assertion failure (#134934) - -* Tue Sep 28 2004 Mark McLoughlin 0.9-1 -- Update to 0.9, remove upstreamed patches - -* Mon Sep 27 2004 Ray Strode 0.8-6 -- Swap if and else in egg_desktop_entries_get_locale_encoding - to prevent allocating massive amounts of unneeded ram. - -* Mon Sep 27 2004 Ray Strode 0.8-5 -- Swap if and else in egg_desktop_entries_get_locale_country - to prevent allocating massive amounts of unneeded ram. - -* Thu Sep 23 2004 Ray Strode 0.8-4 -- Fix the fix for --remove-show-in option - -* Thu Sep 23 2004 Ray Strode 0.8-3 -- Fix --remove-show-in option - -* Mon Sep 13 2004 Dan Williams 0.8-2 -- Fix RH #131983 (annoying log message about "entries != NULL") - -* Fri Sep 3 2004 Mark McLoughlin 0.8-1 -- Update to 0.8 - -* Sat Jul 31 2004 Dan Williams 0.7-1 -- Update to 0.7 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon Mar 1 2004 Dan Williams 0.4-2 -- Fix RH #117201, initial comment fails validation -- Add in, but do not use, Frederic Crozat's freedesktop.org - menu-spec 0.8 patch - -* Thu Feb 19 2004 Mark McLoughlin 0.4-1 -- Update to 0.4 - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Sep 3 2003 Havoc Pennington 0.3-10 -- fix for #103276 (int/size_t issue) from twoerner - -* Mon Jul 7 2003 Alexander Larsson 0.3-9 -- Rebuild - -* Mon Jun 23 2003 Havoc Pennington 0.3-8 -- rebuild - -* Thu Jun 5 2003 Jonathan Blandford 0.3-6 -- Backport patch to allow @MODIFIER in locale keys - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Fri Dec 6 2002 Havoc Pennington -- rebuild - -* Tue Aug 6 2002 Havoc Pennington -- fix more error messages - -* Tue Aug 6 2002 Havoc Pennington -- remove old symlinks before creating new ones, chills out - a lot of error messages - -* Tue Aug 6 2002 Havoc Pennington -- version 0.3 - -* Wed Jul 24 2002 Havoc Pennington -- 0.2.95 cvs snap, should fix OnlyShowIn - -* Mon Jul 22 2002 Havoc Pennington -- 0.2.94 cvs snap, adds --print-available - -* Tue Jul 9 2002 Havoc Pennington -- 0.2.93 cvs snap with a crash fixed, and corrects [KDE Desktop Entry] - -* Fri Jun 21 2002 Havoc Pennington -- 0.2.92 cvs snap with --remove-key and checking for OnlyShowIn - and missing trailing semicolons on string lists - -* Fri Jun 21 2002 Havoc Pennington -- 0.2.91 cvs snap with --copy-name-to-generic-name and - --copy-generic-name-to-name - -* Sun Jun 16 2002 Havoc Pennington -- 0.2.90 cvs snap with --delete-original fixed - -* Fri Jun 07 2002 Havoc Pennington -- rebuild in different environment - -* Wed Jun 5 2002 Havoc Pennington -- 0.2 - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Thu May 09 2002 Havoc Pennington -- rebuild in different environment - -* Thu May 9 2002 Havoc Pennington -- initial build +%autochangelog