From 6372ee587eb4bdc715c0a8c924ffb13126acc3a8 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mar 02 2009 16:34:21 +0000 Subject: - Update to 1.1.7 --- diff --git a/.cvsignore b/.cvsignore index c21d4b4..618b017 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gvfs-1.1.6.tar.bz2 +gvfs-1.1.7.tar.bz2 diff --git a/gvfs-burn-move.patch b/gvfs-burn-move.patch deleted file mode 100644 index f49494f..0000000 --- a/gvfs-burn-move.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: daemon/gvfsbackendburn.c -=================================================================== ---- daemon/gvfsbackendburn.c (revisione 2144) -+++ daemon/gvfsbackendburn.c (copia locale) -@@ -953,6 +953,49 @@ - return TRUE; - } - -+static gboolean -+try_move (GVfsBackend *backend, -+ GVfsJobMove *job, -+ const char *source, -+ const char *destination, -+ GFileCopyFlags flags, -+ GFileProgressCallback progress_callback, -+ gpointer progress_callback_data) -+{ -+ VirtualNode *source_node, *root_node, *source_dir, *dest_dir; -+ -+ root_node = G_VFS_BACKEND_BURN (backend)->root_node; -+ -+ source_node = virtual_node_lookup (root_node, source, &source_dir); -+ if (source_node == NULL) -+ { -+ g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, -+ G_IO_ERROR_NOT_FOUND, -+ _("No such file or directory")); -+ return TRUE; -+ } -+ -+ if (virtual_node_lookup (root_node, destination, &dest_dir) != NULL) -+ { -+ g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, -+ G_IO_ERROR_EXISTS, -+ _("File exists")); -+ return TRUE; -+ } -+ -+ g_free (source_node->filename); -+ source_node->filename = g_path_get_basename (destination); -+ -+ if (source_dir != dest_dir) { -+ source_dir->children = g_list_remove (source_dir->children, source_node); -+ dest_dir->children = g_list_append (dest_dir->children, source_node); -+ } -+ -+ g_vfs_job_succeeded (G_VFS_JOB (job)); -+ -+ return TRUE; -+} -+ - static void - g_vfs_backend_burn_class_init (GVfsBackendBurnClass *klass) - { -@@ -970,6 +1013,7 @@ - backend_class->try_set_display_name = try_set_display_name; - backend_class->try_push = try_push; - backend_class->try_delete = try_delete; -+ backend_class->try_move = try_move; - backend_class->read = do_read; - backend_class->seek_on_read = do_seek_on_read; - backend_class->close_read = do_close_read; diff --git a/gvfs.spec b/gvfs.spec index 726b3ed..807d5d8 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs -Version: 1.1.6 -Release: 2%{?dist} +Version: 1.1.7 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -31,9 +31,6 @@ BuildRequires: libtool # http://bugzilla.gnome.org/show_bug.cgi?id=567235 Patch1: gvfs-0.99.2-archive-integration.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=565041 -Patch2: gvfs-burn-move.patch - %description The gvfs package provides backend implementations for the gio @@ -116,7 +113,6 @@ media players (Media Transfer Protocol) to applications using gvfs. %prep %setup -q %patch1 -p0 -b .archive-integration -%patch2 -p0 -b .burn-move %build @@ -257,6 +253,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Mon Mar 2 2009 Tomas Bzatek - 1.1.7-1 +- Update to 1.1.7 + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 54d51f0..20ea6c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66c69088f63991a965e242e4a516bc2c gvfs-1.1.6.tar.bz2 +c5528812561936fd9501a62382d24585 gvfs-1.1.7.tar.bz2