Compare commits

..

No commits in common. "rawhide" and "f16" have entirely different histories.

9 changed files with 439 additions and 465 deletions

6
.gitignore vendored
View file

@ -3,9 +3,3 @@ 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
/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
/desktop-file-utils-0.28.tar.xz

View file

@ -1,34 +0,0 @@
From 673ec76e881b8dd7f710b846ae0418c09e6f5439 Mon Sep 17 00:00:00 2001
From: Sam Day <me@samcday.com>
Date: Fri, 31 Jan 2025 14:50:21 +0100
Subject: [PATCH] validate: Add Phosh to list of valid OnlyShowIn= environments
Signed-off-by: Sam Day <me@samcday.com>
---
src/validate.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/validate.c b/src/validate.c
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[] = {
- "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 {
@@ -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.47.1

395
changelog
View file

@ -1,395 +0,0 @@
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 31 2025 Sam Day <me@samcday.com> - 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 <releng@fedoraproject.org> - 0.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jul 23 2024 Ryan Brue <ryanbrue@gmail.com> - 0.27-2
- Add patch to include COSMIC as a category
* Tue Jul 23 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.27-1
- Rebase to 0.27
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Feb 12 2024 Tomas Popela <tpopela@redhat.com> - 0.26-12
- Build for the SPDX license format change
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Feb 15 2022 David King <amigadave@amigadave.com> - 0.26-6
- Support files conforming to 1.5 of the specification (#2053905)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 24 2020 Kalev Lember <klember@redhat.com> - 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 <releng@fedoraproject.org> - 0.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Aug 14 2019 Kalev Lember <klember@redhat.com> - 0.24-1
- Update to 0.24
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 09 2018 Adam Williamson <awilliam@redhat.com> - 0.23-8
- Add 'font' as a valid media type (#1564650, fdo#105785)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Feb 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 0.23-6
- scriplets: silence output, ignore errors
- %%license COPYING
- drop deprecated Group: tag
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat Dec 31 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.23-2
- Add Pantheon to the list of desktop environments (#1333550, fdo#97385)
* Fri Jul 01 2016 Michael Catanzaro <mcatanzaro@gnome.org> - 0.23-1
- Update to 0.23
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Aug 14 2015 Matthias Clasen <mclasen@redhat.com> - 0.22-6
- Add file triggers for desktop file mime extraction
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 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 <rel-eng@lists.fedoraproject.org> - 0.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Aug 29 2013 Kalev Lember <kalevlember@gmail.com> - 0.22-1
- Update to 0.22
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Oct 19 2012 Kalev Lember <kalevlember@gmail.com> - 0.21-1
- Update to 0.21
* Thu Sep 06 2012 Dan Mashal <dan.mashal@fedoraproject.org> 0.20-4
- Update F17 to 0.20 (#847097).
* Sat Aug 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 0.20-3
- Fold emacs-* subpackages into main (#690264).
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri May 18 2012 Matthias Clasen <mclasen@redhat.com> - 0.20-1
- Update to 0.20
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Dec 23 2011 Matthias Clasen <mclasen@redhat.com> - 0.19-5
- Fix up locale lists just like other lists
* Tue Dec 20 2011 Matthias Clasen <mclasen@redhat.com> - 0.19-1
- Update to 0.19: support for Unity as desktop env, and support
for Keywords
* Mon Jul 04 2011 Adam Williamson <awilliam@redhat.com> - 0.18-4
- add unity.patch from upstream: add Unity to list of registered
environments
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.18-2
- Add desktop-entry-mode-init.el, fix emacs site-start dir ownership.
* Thu Jan 13 2011 Matthias Clasen <mclasen@redhat.com> - 0.18-1
- Update to 0.18
* Fri Nov 5 2010 Matthias Clasen <mclasen@redhat.com> - 0.16-3
- Don't warn about x-scheme-handler pseudo-mime-types
* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.16-2
- Merge-review cleanup (#225681)
* Thu Apr 1 2010 Matthias Clasen <mclasen@redhat.com> 0.16-1
- Update to 0.16
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 04 2009 Richard Hughes <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rstrode@redhat.com> - 0.15-2
- Drop old unneeded obsoletes on desktop-file-validator
(bug 225681)
* Tue Mar 4 2008 Matthias Clasen <mclasen@redhat.com> - 0.15-1
- Update to 0.15
- Drop upstreamed patch
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.14-3
- Autorebuild for GCC 4.3
* Thu Dec 6 2007 Ray Strode <rstrode@redhat.com> 0.14-2
- make icon extension a warning not an error
* Fri Nov 30 2007 Christopher Stone <chris.stone@gmail.com> 0.14-1
- Upstream sync
- Remove no longer needed short option patch
* Wed Aug 15 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-3
- Make the -m option work (#232761)
* Mon Aug 6 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-2
- Update license field
* Tue Jun 5 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-1
- Update to 0.13, which features a completely rewritten validator
* Thu Mar 08 2007 Florian La Roche <laroche@redhat.com> - 0.12-4
- remove empty post/preun scripts completely
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-3
- drop some rm -f cruft
- don't call update-desktop-database from %%post or %%postun
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-2
- make --vendor optional
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-1
- Update to 0.12
* Fri Oct 27 2006 Ray Strode <rstrode@redhat.com> - 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 <rstrode@redhat.com> - 0.11-3
- actually apply the patch written in 0.11-2
* Thu Oct 26 2006 Ray Strode <rstrode@redhat.com> - 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 <mclasen@redhat.com> - 0.11-1
- Update to 0.11
* Wed Jul 26 2006 Jesse Keating <jkeating@redhat.com> - 0.10-7
- rebuild
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.10-6.1
- bump again for double-long bug on ppc(64)
* Fri Feb 10 2006 Ray Strode <rstrode@redhat.com> - 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 <rstrode@redhat.com> - 0.10-5
- call update-desktop-database in %%post (bug 180898)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.10-4.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Sun Jan 22 2006 Ray Strode <rstrode@redhat.com> - 0.10-4
- don't use uninitialized memory (bug 178591)
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Wed Aug 31 2005 Ray Strode <rstrode@redhat.com> - 0.10-3
- bump build requires for glib to 2.2.0 (bug #146585).
* Thu May 12 2005 Ray Strode <rstrode@redhat.com> - 0.10-2
- Add build requires for emacs (bug #141297).
* Wed Jan 26 2005 Matthias Clasen <mclasen@redhat.com> - 0.10-1
- Update to 0.10
* Mon Oct 18 2004 Miloslav Trmac <mitr@redhat.com> - 0.9-2
- Output error message instead of assertion failure (#134934)
* Tue Sep 28 2004 Mark McLoughlin <markmc@redhat.com> 0.9-1
- Update to 0.9, remove upstreamed patches
* Mon Sep 27 2004 Ray Strode <rstrode@redhat.com> 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 <rstrode@redhat.com> 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 <rstrode@redhat.com> 0.8-4
- Fix the fix for --remove-show-in option
* Thu Sep 23 2004 Ray Strode <rstrode@redhat.com> 0.8-3
- Fix --remove-show-in option
* Mon Sep 13 2004 Dan Williams <dcbw@redhat.com> 0.8-2
- Fix RH #131983 (annoying log message about "entries != NULL")
* Fri Sep 3 2004 Mark McLoughlin <markmc@redhat.com> 0.8-1
- Update to 0.8
* Sat Jul 31 2004 Dan Williams <dcbw@redhat.com> 0.7-1
- Update to 0.7
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon Mar 1 2004 Dan Williams <dcbw@redhat.com> 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 <markmc@redhat.com> 0.4-1
- Update to 0.4
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Sep 3 2003 Havoc Pennington <hp@redhat.com> 0.3-10
- fix for #103276 (int/size_t issue) from twoerner
* Mon Jul 7 2003 Alexander Larsson <alexl@redhat.com> 0.3-9
- Rebuild
* Mon Jun 23 2003 Havoc Pennington <hp@redhat.com> 0.3-8
- rebuild
* Thu Jun 5 2003 Jonathan Blandford <jrb@redhat.com> 0.3-6
- Backport patch to allow @MODIFIER in locale keys
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Fri Dec 6 2002 Havoc Pennington <hp@redhat.com>
- rebuild
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- fix more error messages
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- remove old symlinks before creating new ones, chills out
a lot of error messages
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- version 0.3
* Wed Jul 24 2002 Havoc Pennington <hp@redhat.com>
- 0.2.95 cvs snap, should fix OnlyShowIn
* Mon Jul 22 2002 Havoc Pennington <hp@redhat.com>
- 0.2.94 cvs snap, adds --print-available
* Tue Jul 9 2002 Havoc Pennington <hp@redhat.com>
- 0.2.93 cvs snap with a crash fixed, and corrects [KDE Desktop Entry]
* Fri Jun 21 2002 Havoc Pennington <hp@redhat.com>
- 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 <hp@redhat.com>
- 0.2.91 cvs snap with --copy-name-to-generic-name and
--copy-generic-name-to-name
* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
- 0.2.90 cvs snap with --delete-original fixed
* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
* Wed Jun 5 2002 Havoc Pennington <hp@redhat.com>
- 0.2
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu May 09 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
* Thu May 9 2002 Havoc Pennington <hp@redhat.com>
- initial build

View file

@ -0,0 +1,12 @@
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",

View file

@ -0,0 +1,23 @@
From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
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

View file

@ -1,19 +1,23 @@
%global pkg desktop-file-utils
%global pkgname desktop-file-utils
Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils
Version: 0.28
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
Version: 0.21
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
# 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
License: GPLv2+
Group: Development/Tools
BuildRequires: gcc
BuildRequires: glib2-devel
BuildRequires: emacs
BuildRequires: meson
Requires: emacs-filesystem
Provides: emacs-%{pkg} = %{version}-%{release}
Provides: emacs-%{pkg}-el = %{version}-%{release}
Obsoletes: emacs-%{pkg} < 0.20-3
Obsoletes: emacs-%{pkg}-el < 0.20-3
%description
.desktop files are used to describe an application for inclusion in
@ -25,37 +29,296 @@ fixing it up in the process.
%prep
%autosetup -p1
%setup -q
%build
%meson
%meson_build
%configure
make %{?_smp_mflags}
%install
%meson_install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
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
mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
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 &> /dev/null || :
%transfiletriggerpostun -- %{_datadir}/applications
update-desktop-database &> /dev/null || :
%files
%doc AUTHORS README NEWS
%license COPYING
%doc AUTHORS COPYING README NEWS
%{_bindir}/*
%{_mandir}/man1/desktop-file-install.1*
%{_mandir}/man1/desktop-file-validate.1*
%{_mandir}/man1/update-desktop-database.1*
%{_mandir}/man1/desktop-file-edit.1*
%{_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
%{_emacs_sitestartdir}/desktop-entry-mode-init.el
%ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc
%{_emacs_sitelispdir}/desktop-file-utils/
%{_emacs_sitelispdir}/%{pkg}
%changelog
%autochangelog
* Fri Oct 19 2012 Kalev Lember <kalevlember@gmail.com> - 0.21-1
- Update to 0.21
* Thu Sep 06 2012 Dan Mashal <dan.mashal@fedoraproject.org> 0.20-4
- Update F17 to 0.20 (#847097).
* Sat Aug 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 0.20-3
- Fold emacs-* subpackages into main (#690264).
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri May 18 2012 Matthias Clasen <mclasen@redhat.com> - 0.20-1
- Update to 0.20
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Dec 23 2011 Matthias Clasen <mclasen@redhat.com> - 0.19-5
- Fix up locale lists just like other lists
* Tue Dec 20 2011 Matthias Clasen <mclasen@redhat.com> - 0.19-1
- Update to 0.19: support for Unity as desktop env, and support
for Keywords
* Mon Jul 04 2011 Adam Williamson <awilliam@redhat.com> - 0.18-4
- add unity.patch from upstream: add Unity to list of registered
environments
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.18-2
- Add desktop-entry-mode-init.el, fix emacs site-start dir ownership.
* Thu Jan 13 2011 Matthias Clasen <mclasen@redhat.com> - 0.18-1
- Update to 0.18
* Fri Nov 5 2010 Matthias Clasen <mclasen@redhat.com> - 0.16-3
- Don't warn about x-scheme-handler pseudo-mime-types
* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.16-2
- Merge-review cleanup (#225681)
* Thu Apr 1 2010 Matthias Clasen <mclasen@redhat.com> 0.16-1
- Update to 0.16
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 04 2009 Richard Hughes <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rhughes@redhat.com> - 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 <rstrode@redhat.com> - 0.15-2
- Drop old unneeded obsoletes on desktop-file-validator
(bug 225681)
* Tue Mar 4 2008 Matthias Clasen <mclasen@redhat.com> - 0.15-1
- Update to 0.15
- Drop upstreamed patch
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.14-3
- Autorebuild for GCC 4.3
* Thu Dec 6 2007 Ray Strode <rstrode@redhat.com> 0.14-2
- make icon extension a warning not an error
* Fri Nov 30 2007 Christopher Stone <chris.stone@gmail.com> 0.14-1
- Upstream sync
- Remove no longer needed short option patch
* Wed Aug 15 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-3
- Make the -m option work (#232761)
* Mon Aug 6 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-2
- Update license field
* Tue Jun 5 2007 Matthias Clasen <mclasen@redhat.com> - 0.13-1
- Update to 0.13, which features a completely rewritten validator
* Thu Mar 08 2007 Florian La Roche <laroche@redhat.com> - 0.12-4
- remove empty post/preun scripts completely
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-3
- drop some rm -f cruft
- don't call update-desktop-database from %%post or %%postun
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-2
- make --vendor optional
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-1
- Update to 0.12
* Fri Oct 27 2006 Ray Strode <rstrode@redhat.com> - 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 <rstrode@redhat.com> - 0.11-3
- actually apply the patch written in 0.11-2
* Thu Oct 26 2006 Ray Strode <rstrode@redhat.com> - 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 <mclasen@redhat.com> - 0.11-1
- Update to 0.11
* Wed Jul 26 2006 Jesse Keating <jkeating@redhat.com> - 0.10-7
- rebuild
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.10-6.1
- bump again for double-long bug on ppc(64)
* Fri Feb 10 2006 Ray Strode <rstrode@redhat.com> - 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 <rstrode@redhat.com> - 0.10-5
- call update-desktop-database in %%post (bug 180898)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.10-4.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Sun Jan 22 2006 Ray Strode <rstrode@redhat.com> - 0.10-4
- don't use uninitialized memory (bug 178591)
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Wed Aug 31 2005 Ray Strode <rstrode@redhat.com> - 0.10-3
- bump build requires for glib to 2.2.0 (bug #146585).
* Thu May 12 2005 Ray Strode <rstrode@redhat.com> - 0.10-2
- Add build requires for emacs (bug #141297).
* Wed Jan 26 2005 Matthias Clasen <mclasen@redhat.com> - 0.10-1
- Update to 0.10
* Mon Oct 18 2004 Miloslav Trmac <mitr@redhat.com> - 0.9-2
- Output error message instead of assertion failure (#134934)
* Tue Sep 28 2004 Mark McLoughlin <markmc@redhat.com> 0.9-1
- Update to 0.9, remove upstreamed patches
* Mon Sep 27 2004 Ray Strode <rstrode@redhat.com> 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 <rstrode@redhat.com> 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 <rstrode@redhat.com> 0.8-4
- Fix the fix for --remove-show-in option
* Thu Sep 23 2004 Ray Strode <rstrode@redhat.com> 0.8-3
- Fix --remove-show-in option
* Mon Sep 13 2004 Dan Williams <dcbw@redhat.com> 0.8-2
- Fix RH #131983 (annoying log message about "entries != NULL")
* Fri Sep 3 2004 Mark McLoughlin <markmc@redhat.com> 0.8-1
- Update to 0.8
* Sat Jul 31 2004 Dan Williams <dcbw@redhat.com> 0.7-1
- Update to 0.7
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon Mar 1 2004 Dan Williams <dcbw@redhat.com> 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 <markmc@redhat.com> 0.4-1
- Update to 0.4
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Sep 3 2003 Havoc Pennington <hp@redhat.com> 0.3-10
- fix for #103276 (int/size_t issue) from twoerner
* Mon Jul 7 2003 Alexander Larsson <alexl@redhat.com> 0.3-9
- Rebuild
* Mon Jun 23 2003 Havoc Pennington <hp@redhat.com> 0.3-8
- rebuild
* Thu Jun 5 2003 Jonathan Blandford <jrb@redhat.com> 0.3-6
- Backport patch to allow @MODIFIER in locale keys
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Fri Dec 6 2002 Havoc Pennington <hp@redhat.com>
- rebuild
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- fix more error messages
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- remove old symlinks before creating new ones, chills out
a lot of error messages
* Tue Aug 6 2002 Havoc Pennington <hp@redhat.com>
- version 0.3
* Wed Jul 24 2002 Havoc Pennington <hp@redhat.com>
- 0.2.95 cvs snap, should fix OnlyShowIn
* Mon Jul 22 2002 Havoc Pennington <hp@redhat.com>
- 0.2.94 cvs snap, adds --print-available
* Tue Jul 9 2002 Havoc Pennington <hp@redhat.com>
- 0.2.93 cvs snap with a crash fixed, and corrects [KDE Desktop Entry]
* Fri Jun 21 2002 Havoc Pennington <hp@redhat.com>
- 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 <hp@redhat.com>
- 0.2.91 cvs snap with --copy-name-to-generic-name and
--copy-generic-name-to-name
* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
- 0.2.90 cvs snap with --delete-original fixed
* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
* Wed Jun 5 2002 Havoc Pennington <hp@redhat.com>
- 0.2
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu May 09 2002 Havoc Pennington <hp@redhat.com>
- rebuild in different environment
* Thu May 9 2002 Havoc Pennington <hp@redhat.com>
- initial build

99
localelist-fixup.patch Normal file
View file

@ -0,0 +1,99 @@
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;
}
+

12
scheme-handler.patch Normal file
View file

@ -0,0 +1,12 @@
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[] = {

View file

@ -1 +1 @@
SHA512 (desktop-file-utils-0.28.tar.xz) = 1024172fcd37ace0660fd58195c0562b47f1ef8ed37f662b88048c295a388d1458d01f86799b34ec9e8b27a7ea441f98665f0d641c29cb5ecc3abd7da41230f0
fda5c312c9fb3b8d818fb54f2c34db82 desktop-file-utils-0.21.tar.xz