rpms/gvfs/devel gvfs-1.5.1-afc-remove-unreleased.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 gvfs.spec, 1.163, 1.164 sources, 1.49, 1.50 0001-Add-AFC-backend.patch, 1.2, NONE gvfs-1.4.1-http-soup-header-parsing.patch, 1.1, NONE gvfs-1.4.1-http-suport-stream-query-info.patch, 1.1, NONE gvfs-1.4.2-handle-null-gdudevices.patch, 1.1, NONE gvfs-1.4.2-remove-dead-code.patch, 1.1, NONE gvfs-1.4.2-smb-queryfs.patch, 1.1, NONE http-icons.patch, 1.1, NONE
Tomas Bzatek
tbzatek at fedoraproject.org
Wed Nov 18 14:05:09 UTC 2009
Author: tbzatek
Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3576
Modified Files:
.cvsignore gvfs.spec sources
Added Files:
gvfs-1.5.1-afc-remove-unreleased.patch
Removed Files:
0001-Add-AFC-backend.patch
gvfs-1.4.1-http-soup-header-parsing.patch
gvfs-1.4.1-http-suport-stream-query-info.patch
gvfs-1.4.2-handle-null-gdudevices.patch
gvfs-1.4.2-remove-dead-code.patch gvfs-1.4.2-smb-queryfs.patch
http-icons.patch
Log Message:
* Wed Nov 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.5.1-1
- Update to 1.5.1
- AFC: temporarily disable setting file modification times
gvfs-1.5.1-afc-remove-unreleased.patch:
gvfsbackendafc.c | 41 -----------------------------------------
1 file changed, 41 deletions(-)
--- NEW FILE gvfs-1.5.1-afc-remove-unreleased.patch ---
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;
}
/*
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore 21 Sep 2009 14:50:35 -0000 1.48
+++ .cvsignore 18 Nov 2009 14:05:07 -0000 1.49
@@ -1 +1 @@
-gvfs-1.4.0.tar.bz2
+gvfs-1.5.1.tar.bz2
Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- gvfs.spec 12 Nov 2009 17:32:43 -0000 1.163
+++ gvfs.spec 18 Nov 2009 14:05:08 -0000 1.164
@@ -1,11 +1,11 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
-Version: 1.4.1
-Release: 6%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/1.4/gvfs-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gvfs/1.5/gvfs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
BuildRequires: glib2-devel >= 2.21.2
@@ -14,7 +14,7 @@ BuildRequires: /usr/bin/ssh
BuildRequires: libcdio-devel >= 0.78.2
BuildRequires: hal-devel >= 0.5.10
BuildRequires: libgudev-devel
-BuildRequires: libsoup-devel >= 2.25.2
+BuildRequires: libsoup-devel >= 2.26.0
BuildRequires: avahi-glib-devel >= 0.6
BuildRequires: gnome-keyring-devel
BuildRequires: intltool
@@ -22,9 +22,7 @@ BuildRequires: gettext-devel
BuildRequires: GConf2-devel
BuildRequires: gnome-disk-utility-devel >= 2.28.1-1
BuildRequires: PolicyKit-devel
-# This is a hack until the xfce4-notifyd dependency issue is fixed
-# https://fedorahosted.org/rel-eng/ticket/1788
-#BuildRequires: notification-daemon
+BuildRequires: expat-devel
Requires(post): desktop-file-utils
@@ -35,17 +33,9 @@ BuildRequires: automake autoconf
BuildRequires: libtool
# http://bugzilla.gnome.org/show_bug.cgi?id=567235
Patch0: gvfs-archive-integration.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=591005
-Patch1: 0001-Add-AFC-backend.patch
-# from upstream
-Patch2: http-icons.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=565337
-Patch3: gvfs-1.4.2-smb-queryfs.patch
-# from upstream
-Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
-Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
-Patch14: gvfs-1.4.2-remove-dead-code.patch
-Patch15: gvfs-1.4.2-handle-null-gdudevices.patch
+# some AFC code depends on unreleased libiphone additions
+Patch1: gvfs-1.5.1-afc-remove-unreleased.patch
+
Obsoletes: gnome-mount <= 0.8
Obsoletes: gnome-mount-nautilus-properties <= 0.8
@@ -106,7 +96,6 @@ Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: obex-data-server >= 0.3.4-6
BuildRequires: bluez-libs-devel >= 3.12
-BuildRequires: expat-devel
Obsoletes: gnome-vfs2-obexftp <= 0.4
%description obexftp
@@ -132,7 +121,7 @@ Summary: AFC support for gvfs
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: usbmuxd
-BuildRequires: libiphone-devel >= 0.9.2
+BuildRequires: libiphone-devel >= 0.9.4
%description afc
This package provides support for reading files on Apple iPhones and
@@ -142,13 +131,7 @@ and iPod Touches to applications using g
%prep
%setup -q
%patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .afc
-%patch2 -p1 -b .http-icons
-%patch3 -p1 -b .smb-queryfs
-%patch12 -p1 -b .http-query-info
-%patch13 -p1 -b .http-headers
-%patch14 -p1 -b .dead-code
-%patch15 -p1 -b .gdu-null-devices
+%patch1 -p1 -b .afc-unreleased
%build
@@ -314,6 +297,10 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/remote-volume-monitors/afc.monitor
%changelog
+* Wed Nov 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.5.1-1
+- Update to 1.5.1
+- AFC: temporarily disable setting file modification times
+
* Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 1.4.1-6
- Add obsoletes for gnome-mount
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources 12 Nov 2009 17:32:43 -0000 1.49
+++ sources 18 Nov 2009 14:05:08 -0000 1.50
@@ -1 +1 @@
-6eff809d50e618f289d5192724a049de gvfs-1.4.1.tar.bz2
+46a7efa529d2fb8a0beee213da650b4d gvfs-1.5.1.tar.bz2
--- 0001-Add-AFC-backend.patch DELETED ---
--- gvfs-1.4.1-http-soup-header-parsing.patch DELETED ---
--- gvfs-1.4.1-http-suport-stream-query-info.patch DELETED ---
--- gvfs-1.4.2-handle-null-gdudevices.patch DELETED ---
--- gvfs-1.4.2-remove-dead-code.patch DELETED ---
--- gvfs-1.4.2-smb-queryfs.patch DELETED ---
--- http-icons.patch DELETED ---
More information about the scm-commits
mailing list