|
|
Author: rstrode
Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21909
Modified Files:
desktop-file-utils-0.11-make-category-validation-non-fatal.patch
desktop-file-utils.spec
Log Message:
- commit the fix attempted in 0.11-2 and 0.11-3 to the right
function...
desktop-file-utils-0.11-make-category-validation-non-fatal.patch:
validate.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: desktop-file-utils-0.11-make-category-validation-non-fatal.patch
===================================================================
RCS file:
/cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils-0.11-make-category-validation-non-fatal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop-file-utils-0.11-make-category-validation-non-fatal.patch 26 Oct
2006 14:05:54 -0000 1.1
+++ desktop-file-utils-0.11-make-category-validation-non-fatal.patch 27 Oct
2006 18:32:38 -0000 1.2
@@ -1,11 +1,20 @@
---- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal
2006-10-26 10:07:30.000000000 -0400
-+++ desktop-file-utils-0.11/src/validate.c 2006-10-26 10:07:37.000000000
-0400
-@@ -285,7 +285,7 @@
- char *valid_onlyshowins;
+--- 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_onlyshowins = g_strjoinv ("\", \"", (gchar **) onlyshowin_keys);
+ 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_onlyshowins, vals[i]);
- g_free (valid_onlyshowins);
+ key, valid_categories, vals[i]);
+ g_free (valid_categories);
}
Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- desktop-file-utils.spec 27 Oct 2006 14:34:29 -0000 1.33
+++ desktop-file-utils.spec 27 Oct 2006 18:32:38 -0000 1.34
@@ -1,7 +1,7 @@
Summary: Utilities for manipulating .desktop files
Name: desktop-file-utils
Version: 0.11
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.freedesktop.org/software/desktop-file-utils
Source0: %{name}-%{version}.tar.gz
Patch1: desktop-file-utils-0.10-dont-use-unintialized-memory.patch
@@ -57,8 +57,12 @@
%{_datadir}/emacs/site-lisp/
%changelog
+* Fri Oct 27 2006 Ray Strode <rstrode@xxxxxxxxxx> - 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@xxxxxxxxxx> - 0.11-3
-- actually apply the patch writte in 0.11-2
+- actually apply the patch written in 0.11-2
* Thu Oct 26 2006 Ray Strode <rstrode@xxxxxxxxxx> - 0.11-2
- make desktop file validation non-fatal until we
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|