rpms/glib2/F-12 glib-2.22.3-metadata-symlink-device.patch, NONE, 1.1 glib2.spec, 1.228, 1.229

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2012

Modified Files:
	glib2.spec 
Added Files:
	glib-2.22.3-metadata-symlink-device.patch 
Log Message:
* Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.22.2-3
- Fix metadata setting for symlinks (#529329)


glib-2.22.3-metadata-symlink-device.patch:
 glocalfileinfo.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE glib-2.22.3-metadata-symlink-device.patch ---
>From 2b2195bf68bf68837dc9f6b4765d3716694f42b3 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 26 Nov 2009 15:05:07 +0000
Subject: Pass in the right device to vfs->local_file_add_info for symlinks

We used to pass the path for the symlink, but the device of the target
which is wrong and breaks metadata access.

https://bugzilla.gnome.org/show_bug.cgi?id=593809
---
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 0a063e9..0eb16db 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1432,6 +1432,7 @@ _g_local_file_info_get (const char             *basename,
   char *symlink_target;
   GVfs *vfs;
   GVfsClass *class;
+  guint64 device;
 
   info = g_file_info_new ();
 
@@ -1483,7 +1484,9 @@ _g_local_file_info_get (const char             *basename,
       g_free (display_name);
       return NULL;
     }
-  
+
+  device = statbuf.st_dev;
+
 #ifdef S_ISLNK
   is_symlink = S_ISLNK (statbuf.st_mode);
 #else
@@ -1711,7 +1714,7 @@ _g_local_file_info_get (const char             *basename,
     {
       class->local_file_add_info (vfs,
                                   path,
-                                  statbuf.st_dev,
+                                  device,
                                   attribute_matcher,
                                   info,
                                   NULL,
--
cgit v0.8.2


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- glib2.spec	25 Oct 2009 07:02:11 -0000	1.228
+++ glib2.spec	30 Nov 2009 17:29:13 -0000	1.229
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -25,6 +25,10 @@ BuildRequires: gtk-doc
 Patch0: 0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch
 Patch1: 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch
 
+# [nautilus] symlink icons aren't appearing on the desktop in the right place
+# https://bugzilla.redhat.com/show_bug.cgi?id=529329
+Patch2: glib-2.22.3-metadata-symlink-device.patch
+
 %description
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -58,6 +62,7 @@ of version 2 of the GLib library.
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .mime-weight
 %patch1 -p1 -b .mime-matches
+%patch2 -p1 -b .metadata-symlink-device
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Nov 30 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.22.2-3
+- Fix metadata setting for symlinks (#529329)
+
 * Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.2-2
 - Fix two problems with mime type detection in GIO