rpms/desktop-file-utils/devel desktop-file-utils-0.12-make-vendor-optional.patch, NONE, 1.1 desktop-file-utils.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17322

Modified Files:
	desktop-file-utils.spec 
Added Files:
	desktop-file-utils-0.12-make-vendor-optional.patch 
Log Message:
- make --vendor optional


desktop-file-utils-0.12-make-vendor-optional.patch:
 install.c |   10 +---------
 1 files changed, 1 insertion(+), 9 deletions(-)

--- NEW FILE desktop-file-utils-0.12-make-vendor-optional.patch ---
--- 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"));




Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- desktop-file-utils.spec	29 Nov 2006 03:22:29 -0000	1.36
+++ desktop-file-utils.spec	2 Feb 2007 19:54:44 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,6 +13,8 @@
 
 Obsoletes: desktop-file-validator
 
+Patch0: desktop-file-utils-0.12-make-vendor-optional.patch
+
 %description
 .desktop files are used to describe an application for inclusion in
 GNOME or KDE menus.  This package contains desktop-file-validate which
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .make-vendor-optional
 
 %build
 
@@ -52,6 +55,9 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Tue Nov 28 2006 Ray Strode <rstrode at redhat.com> - 0.12-2
+- make --vendor optional
+
 * Tue Nov 28 2006 Ray Strode <rstrode at redhat.com> - 0.12-1
 - Update to 0.12