From 829801e676362ca6ab004aba6e7695472c710ad2 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Dec 15 2009 15:57:41 +0000 Subject: - Rebuilt against new libiphone --- diff --git a/gvfs-1.5.1-afc-remove-unreleased.patch b/gvfs-1.5.1-afc-remove-unreleased.patch deleted file mode 100644 index 1085dc2..0000000 --- a/gvfs-1.5.1-afc-remove-unreleased.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c -index 8722ca7..8b87141 100644 ---- a/daemon/gvfsbackendafc.c -+++ b/daemon/gvfsbackendafc.c -@@ -1150,46 +1150,6 @@ g_vfs_backend_afc_set_display_name (GVfsBackend *backend, - } - - static void --g_vfs_backend_afc_set_attribute (GVfsBackend *backend, -- GVfsJobSetAttribute *job, -- const char *filename, -- const char *attribute, -- GFileAttributeType type, -- gpointer value_p, -- GFileQueryInfoFlags flags) --{ -- GVfsBackendAfc *self; -- uint64_t mtime = 0; -- afc_error_t err; -- -- self = G_VFS_BACKEND_AFC(backend); -- g_return_if_fail(self->connected); -- -- if (g_str_equal (attribute, G_FILE_ATTRIBUTE_TIME_MODIFIED) == FALSE) -- { -- g_vfs_job_failed (G_VFS_JOB (job), -- G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, -- _("Operation unsupported")); -- return; -- } -- -- mtime = *(guint64*)(value_p) * (guint64)1000000000; -- -- err = afc_set_file_time (self->afc_cli, filename, mtime); -- if (err == AFC_E_UNKNOWN_PACKET_TYPE) -- { -- /* ignore error for pre-3.1 devices as the do not support setting file modification times */ -- return g_vfs_job_succeeded (G_VFS_JOB(job)); -- } -- if (G_UNLIKELY(g_vfs_backend_afc_check (err, G_VFS_JOB(job)))) -- { -- return; -- } -- -- g_vfs_job_succeeded (G_VFS_JOB(job)); --} -- --static void - g_vfs_backend_afc_make_directory (GVfsBackend *backend, - GVfsJobMakeDirectory *job, - const char *path) -@@ -1336,7 +1296,6 @@ g_vfs_backend_afc_class_init (GVfsBackendAfcClass *klass) - backend_class->make_symlink = g_vfs_backend_afc_make_symlink; - backend_class->move = g_vfs_backend_afc_move; - backend_class->set_display_name = g_vfs_backend_afc_set_display_name; -- backend_class->set_attribute = g_vfs_backend_afc_set_attribute; - } - - /* diff --git a/gvfs.spec b/gvfs.spec index 2b0564d..80022c4 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,7 +1,7 @@ Summary: Backends for the gio framework in GLib Name: gvfs Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -33,8 +33,6 @@ BuildRequires: automake autoconf BuildRequires: libtool # http://bugzilla.gnome.org/show_bug.cgi?id=567235 Patch0: gvfs-archive-integration.patch -# some AFC code depends on unreleased libiphone additions -Patch1: gvfs-1.5.1-afc-remove-unreleased.patch # from upstream Patch2: gvfs-1.5.2-metadata-fix-rotated.patch Patch3: gvfs-1.5.2-metadata-fsync-directory.patch @@ -138,7 +136,6 @@ and iPod Touches to applications using gvfs. %prep %setup -q %patch0 -p1 -b .archive-integration -%patch1 -p1 -b .afc-unreleased %patch2 -p1 -b .metadata-rotated %patch3 -p1 -b .metadata-dir-fsync %patch4 -p1 -b .smb-queryfs-older @@ -310,6 +307,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/gvfs/remote-volume-monitors/afc.monitor %changelog +* Tue Dec 15 2009 Tomas Bzatek - 1.5.1-3 +- Rebuilt against new libiphone + * Mon Nov 30 2009 Tomas Bzatek - 1.5.1-2 - Metadata fixes - SMB: Fix free space calculation for older samba servers