rpms/gvfs/F-12 gvfs-1.4.0-mountspec-from-string.patch, NONE, 1.1 gvfs.spec, 1.159, 1.160

[Tomas Bzatek]

Author: tbzatek

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

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.4.0-mountspec-from-string.patch 
Log Message:
* Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
- Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
- Actually apply the logical partitions patch


gvfs-1.4.0-mountspec-from-string.patch:
 gmountspec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.0-mountspec-from-string.patch ---
>From 7a430e4dc930115b620bf3aa2b9682ee1047dc48 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 8 Oct 2009 15:48:15 +0200
Subject: [PATCH] Fix creating mount_spec from string

Don't consume the ending character.
---
 common/gmountspec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/gmountspec.c b/common/gmountspec.c
index c55f996..1a9a60a 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -514,7 +514,7 @@ g_mount_spec_new_from_string (const gchar     *str,
   if (colon)
     {
       item.key = g_strdup ("type");
-      item.value = g_strndup (str, colon - str - 1);
+      item.value = g_strndup (str, colon - str);
       g_array_append_val (items, item);
       str = colon + 1;
     }
-- 
1.6.5.rc2



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- gvfs.spec	1 Oct 2009 23:21:39 -0000	1.159
+++ gvfs.spec	8 Oct 2009 14:45:02 -0000	1.160
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -41,6 +41,9 @@ Patch1: 0001-Add-AFC-backend.patch
 Patch2: http-icons.patch
 # from upstream
 Patch3: consider-logical-partitions.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=526892
+# Nautilus not displaying friendly icons for SSH-connected system
+Patch4: gvfs-1.4.0-mountspec-from-string.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -135,6 +138,8 @@ and iPod Touches to applications using g
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
 %patch2 -p1 -b .http-icons
+%patch3 -p1 -b .logical-partitions
+%patch4 -p1 -b .favicons
 
 %build
 
@@ -288,6 +293,10 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
+- Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
+- Actually apply the logical partitions patch
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-3
 - Consider logical partitions when deciding if a drive should be ignored