rpms/glib2/devel appinfo.patch,NONE,1.1 glib2.spec,1.163,1.164

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/glib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490

Modified Files:
	glib2.spec 
Added Files:
	appinfo.patch 
Log Message:
Fix a possible crash in application launching (bgo#527132)


appinfo.patch:

--- NEW FILE appinfo.patch ---
diff -up glib-2.16.3/gio/gdesktopappinfo.c.appinfo glib-2.16.3/gio/gdesktopappinfo.c
--- glib-2.16.3/gio/gdesktopappinfo.c.appinfo	2008-04-09 10:57:31.000000000 -0400
+++ glib-2.16.3/gio/gdesktopappinfo.c	2008-04-09 10:57:43.000000000 -0400
@@ -1514,7 +1514,6 @@ g_app_info_create_from_commandline (cons
     info->exec = g_strconcat (commandline, " %u", NULL);
   else
     info->exec = g_strconcat (commandline, " %f", NULL);
-  info->comment = g_strdup_printf (_("Custom definition for %s"), info->name);
   info->nodisplay = TRUE;
   info->binary = binary_from_exec (info->exec);
   
@@ -1530,6 +1529,7 @@ g_app_info_create_from_commandline (cons
       if (info->name == NULL)
 	info->name = g_strdup ("custom");
     }
+  info->comment = g_strdup_printf (_("Custom definition for %s"), info->name);
   
   return G_APP_INFO (info);
 }


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- glib2.spec	8 Apr 2008 05:12:37 -0000	1.163
+++ glib2.spec	9 Apr 2008 15:00:24 -0000	1.164
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.16.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -19,6 +19,9 @@
 # for sys/inotify.h
 BuildRequires: glibc-devel
 
+# fix a possible crasher, http://bugzilla.gnome.org/show_bug.cgi?id=527132
+Patch0: appinfo.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -50,6 +53,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .appinfo
 
 %build
 %configure --disable-gtk-doc --enable-static 
@@ -122,6 +126,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Apr  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.3-2
+- Fix a possible crash in application launching (bgo#527132)
+
 * Tue Apr  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.3-1
 - Update to 2.16.3