rpms/desktop-file-utils/F-7 desktop-file-utils-0.12-encoding.patch, NONE, 1.1 desktop-file-utils.spec, 1.40, 1.41

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/desktop-file-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24281

Modified Files:
	desktop-file-utils.spec 
Added Files:
	desktop-file-utils-0.12-encoding.patch 
Log Message:
dont error on missing encoding bz#406791

desktop-file-utils-0.12-encoding.patch:

--- NEW FILE desktop-file-utils-0.12-encoding.patch ---
--- src/validate.c~	2007-11-30 12:30:56.000000000 -0800
+++ src/validate.c	2007-11-30 12:52:01.000000000 -0800
@@ -453,7 +453,7 @@
   void (*validate_type) (const char *value, const char *key, const char *locale, const char *filename, GnomeDesktopFile *df);
   gboolean deprecated;
 } key_table[] = {
-  { "Encoding", validate_string },
+  { "Encoding", validate_string, TRUE },
   { "Version", validate_numeric },
   { "Name", validate_localestring },
   { "GenericName", validate_localestring },
@@ -735,10 +735,6 @@
 	  strcmp (val, "Legacy-Mixed") != 0)
 	print_fatal (filename, "unknown Encoding type \"%s\", should be one of \"UTF-8\", \"Legacy-Mixed\"\n", val);
     }
-  else
-    {
-      print_fatal (filename, "required key \"Encoding\" not found\n");
-    }
 
   if (!gnome_desktop_file_get_raw (df, section,
 				   "Name",


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/desktop-file-utils/F-7/desktop-file-utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- desktop-file-utils.spec	8 Mar 2007 09:43:58 -0000	1.40
+++ desktop-file-utils.spec	1 Dec 2007 03:04:28 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@
 Obsoletes: desktop-file-validator
 
 Patch0: desktop-file-utils-0.12-make-vendor-optional.patch
+Patch1: %{name}-0.12-encoding.patch
 
 %description
 .desktop files are used to describe an application for inclusion in
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .make-vendor-optional
+%patch1 -p0 -b .encoding~
 
 %build
 %configure
@@ -44,6 +46,9 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Nov 30 2007 Christopher Stone <chris.stone at gmail.com> 0.12-5
+- add enconding patch (bz #406791)
+
 * Thu Mar 08 2007 Florian La Roche <laroche at redhat.com> - 0.12-4
 - remove empty post/preun scripts completely