Accepting request 207687 from GNOME:Factory

Push GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/207687
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=102
This commit is contained in:
Stephan Kulow 2013-11-24 11:00:08 +00:00 committed by Git OBS Bridge
commit cfabd35f39
5 changed files with 13 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7
size 1520572

3
gvfs-1.18.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c
size 1537320

View File

@ -1,45 +0,0 @@
From 921b813784ba0505fff76edb1a3bd20c40b78b75 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Fri, 11 Oct 2013 22:04:51 +0200
Subject: [PATCH] dav: Set file type to regular by default
Some servers send empty resourcetype nodes or don't send the node at all
for regular files (the spec says that it defaults to empty). Set the
file type to regular by default.
https://bugzilla.gnome.org/show_bug.cgi?id=706798
---
daemon/gvfsbackenddav.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
index 2feb980..39995d6 100644
--- a/daemon/gvfsbackenddav.c
+++ b/daemon/gvfsbackenddav.c
@@ -991,7 +991,7 @@ ms_response_to_file_info (MsResponse *response,
g_file_info_set_name (info, basename);
g_file_info_set_edit_name (info, basename);
- file_type = G_FILE_TYPE_UNKNOWN;
+ file_type = G_FILE_TYPE_REGULAR;
mime_type = NULL;
have_display_name = FALSE;
@@ -1013,7 +1013,6 @@ ms_response_to_file_info (MsResponse *response,
if (node_has_name (node, "resourcetype"))
{
file_type = parse_resourcetype (node);
- g_file_info_set_file_type (info, file_type);
}
else if (node_has_name (node, "displayname") && text)
{
@@ -1059,6 +1058,7 @@ ms_response_to_file_info (MsResponse *response,
}
}
+ g_file_info_set_file_type (info, file_type);
if (file_type == G_FILE_TYPE_DIRECTORY)
{
icon = g_themed_icon_new ("folder");
--
1.8.1.5

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Nov 11 20:58:59 UTC 2013 - dimstar@opensuse.org
- Update to version 1.18.3 (bnc#849913):
+ Fix seeking past end of file for various backends.
+ fuse: Improve write performance.
+ archive: Handle open failure.
- Drop gvfs-webdav_file_types.patch: fixed upstream.
-------------------------------------------------------------------
Sat Oct 26 17:57:13 UTC 2013 - stefan.bruens@rwth-aachen.de

View File

@ -20,7 +20,7 @@
%define with_cdda 1
Name: gvfs
Version: 1.18.2
Version: 1.18.3
Release: 0
Summary: VFS functionality for GLib
License: LGPL-2.0+
@ -32,8 +32,6 @@ Source99: baselibs.conf
Patch5: gvfs-nvvfs.patch
# PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
Patch6: gvfs-nds.patch
# PATCH-FIX-UPSTREAM gvfs-webdav_file_types.patch bgo#706798 bnc#848129 stefan.bruens@rwth-aachen.de -- gvfs-webdav_file_types.patch
Patch7: gvfs-webdav_file_types.patch
BuildRequires: bluez-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fuse-devel
@ -141,7 +139,6 @@ VFS functionality for GLib.
translation-update-upstream
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
autoreconf -f