diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index ebb6686..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -desktop-file-utils-0.13.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a747c6a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +desktop-file-utils-0.15.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 010b1b4..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: desktop-file-utils -# $Id$ -NAME := desktop-file-utils -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/desktop-file-utils-0.10-dont-use-unintialized-memory.patch b/desktop-file-utils-0.10-dont-use-unintialized-memory.patch deleted file mode 100644 index 884f646..0000000 --- a/desktop-file-utils-0.10-dont-use-unintialized-memory.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- desktop-file-utils-0.10/src/update-desktop-database.c.dont-use-uninitialized-memory 2006-01-22 15:53:08.000000000 -0500 -+++ desktop-file-utils-0.10/src/update-desktop-database.c 2006-01-22 15:53:17.000000000 -0500 -@@ -444,7 +444,7 @@ - - for (i = 0; data_dirs[i] != NULL; i++); - -- args = g_new (char *, i + 1); -+ args = g_new0 (char *, i + 1); - - for (i = 0; data_dirs[i] != NULL; i++) - args[i] = g_build_filename (data_dirs[i], "applications", NULL); diff --git a/desktop-file-utils-0.11-make-category-validation-non-fatal.patch b/desktop-file-utils-0.11-make-category-validation-non-fatal.patch deleted file mode 100644 index ac6be31..0000000 --- a/desktop-file-utils-0.11-make-category-validation-non-fatal.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal 2006-04-18 18:03:13.000000000 -0400 -+++ desktop-file-utils-0.11/src/validate.c 2006-10-27 14:33:53.000000000 -0400 -@@ -208,7 +208,7 @@ - { - if (strcmp (vals[i], categories_keys[j]) != 0) - { -- print_fatal (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n", -+ print_warning (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n", - key, categories_keys[j], vals[i]); - } - break; -@@ -221,7 +221,7 @@ - char *valid_categories; - - valid_categories = g_strjoinv ("\", \"", (gchar **) categories_keys); -- print_fatal (filename, "%s values must be one of \"%s\" (found \"%s\")\n", -+ print_warning (filename, "%s values must be one of \"%s\" (found \"%s\")\n", - key, valid_categories, vals[i]); - g_free (valid_categories); - } diff --git a/desktop-file-utils-0.12-make-vendor-optional.patch b/desktop-file-utils-0.12-make-vendor-optional.patch deleted file mode 100644 index 0ed9b93..0000000 --- a/desktop-file-utils-0.12-make-vendor-optional.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- desktop-file-utils-0.12/src/install.c 18 Apr 2006 22:08:10 -0000 1.18 -+++ desktop-file-utils-0.12/src/install.c 2 Feb 2007 19:43:27 -0000 -@@ -96,12 +96,10 @@ process_one_file (const char *filename, - GError *rebuild_error; - GSList *tmp; - -- g_assert (vendor_name); -- - dirname = g_path_get_dirname (filename); - basename = g_path_get_basename (filename); - -- if (!g_str_has_prefix (basename, vendor_name)) -+ if (vendor_name && !g_str_has_prefix (basename, vendor_name)) - { - char *new_base; - new_base = g_strconcat (vendor_name, "-", basename, NULL); -@@ -564,12 +562,6 @@ main (int argc, char **argv) - if (vendor_name == NULL) - vendor_name = g_strdup (g_getenv ("DESKTOP_FILE_VENDOR")); - -- if (vendor_name == NULL) -- { -- g_printerr (_("Must specify the vendor namespace for these files with --vendor\n")); -- return 1; -- } -- - if (copy_generic_name_to_name && copy_name_to_generic_name) - { - g_printerr (_("Specifying both --copy-name-to-generic-name and --copy-generic-name-to-name at once doesn't make much sense.\n")); - - 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-0.9-nogroup.patch b/desktop-file-utils-0.9-nogroup.patch deleted file mode 100644 index dc0b561..0000000 --- a/desktop-file-utils-0.9-nogroup.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- desktop-file-utils-0.9/src/eggdesktopentries.c.nogroup 2004-10-18 14:10:48.527841168 +0200 -+++ desktop-file-utils-0.9/src/eggdesktopentries.c 2004-10-18 14:19:33.102093760 +0200 -@@ -884,6 +884,15 @@ - gchar *key, *value, *key_end, *value_start, *locale; - gsize key_len, value_len; - -+ if (entries->current_group->name == NULL) -+ { -+ g_set_error (error, EGG_DESKTOP_ENTRIES_ERROR, -+ EGG_DESKTOP_ENTRIES_ERROR_BAD_START_GROUP, -+ _("desktop entry file does not start with " -+ "legal start group")); -+ return; -+ } -+ - key_end = value_start = strchr (line, '='); - - g_assert (key_end != NULL); diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 5b0278f..68063cb 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.13 -Release: 3%{?dist} +Version: 0.15 +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 -Patch0: short-option.patch License: GPLv2+ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -13,8 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.12.0 BuildRequires: emacs -Obsoletes: desktop-file-validator - %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -25,7 +22,6 @@ fixing it up in the process. %prep %setup -q -%patch0 -p1 -b .short-option %build %configure @@ -45,6 +41,24 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* 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) diff --git a/short-option.patch b/short-option.patch deleted file mode 100644 index 54a0721..0000000 --- a/short-option.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up desktop-file-utils-0.13/src/install.c.short-option desktop-file-utils-0.13/src/install.c ---- desktop-file-utils-0.13/src/install.c.short-option 2007-08-15 21:14:57.000000000 -0400 -+++ desktop-file-utils-0.13/src/install.c 2007-08-15 21:17:06.000000000 -0400 -@@ -430,7 +430,9 @@ parse_options_callback (const gchar *op - GError **error) - { - /* skip "--" */ -- option_name += 2; -+ option_name++; -+ if (*option_name == '-') -+ option_name++; - - if (strcmp (OPTION_VENDOR, option_name) == 0) - { -@@ -480,7 +482,8 @@ parse_options_callback (const gchar *op - g_strdup (value)); - } - -- else if (strcmp (OPTION_MODE, option_name) == 0) -+ else if (strcmp (OPTION_MODE, option_name) == 0 || -+ strcmp ("m", option_name) == 0) - { - unsigned long ul; - char *end; diff --git a/sources b/sources index c5ba7af..77a1d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ee84d0de753d4052011714c20d6efae desktop-file-utils-0.13.tar.gz +2fe8ebe222fc33cd4a959415495b7eed desktop-file-utils-0.15.tar.gz