From 02caeafc41ac42ed5d021a7f086e885a23fc82e8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 5 Nov 2010 13:33:21 -0400 Subject: [PATCH] don't warn about x-scheme-handler pseudo-mime-types --- desktop-file-utils.spec | 9 ++++++++- scheme-handler.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 scheme-handler.patch diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index fbc07f2..689a3ec 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.16 -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.bz2 License: GPLv2+ @@ -12,6 +12,9 @@ Group: Development/Tools BuildRequires: glib2-devel +# https://bugs.freedesktop.org/show_bug.cgi?id=31413 +Patch0: scheme-handler.patch + %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -44,6 +47,7 @@ Install the %{name} package to use %{pkgname} with GNU Emacs. %prep %setup -q +%patch0 -p1 -b .scheme-handler %build %configure @@ -70,6 +74,9 @@ mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdi %{_emacs_sitelispdir}/%{pkg}/*.el %changelog +* 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) diff --git a/scheme-handler.patch b/scheme-handler.patch new file mode 100644 index 0000000..71a760f --- /dev/null +++ b/scheme-handler.patch @@ -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[] = {