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 new file mode 100644 index 0000000..2e96912 --- /dev/null +++ b/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch @@ -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", diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 7e87876..8dab2c3 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.14 -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.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -14,6 +14,8 @@ BuildRequires: emacs Obsoletes: desktop-file-validator +Patch0: desktop-file-utils-0.14-make-icon-extension-non-fatal.patch + %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -24,6 +26,7 @@ fixing it up in the process. %prep %setup -q +%patch0 -p1 -b .make-icon-extension-non-fatal %build %configure @@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* 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