- Update to 1.1.4

This commit is contained in:
Tomas Bzatek 2009-01-20 09:16:21 +00:00
parent 0b5230a47b
commit 2e06161871
5 changed files with 7 additions and 41 deletions

View File

@ -1 +1 @@
gvfs-1.1.3.tar.bz2 gvfs-1.1.4.tar.bz2

View File

@ -1,24 +0,0 @@
--- gvfs-1.1.1/daemon/gvfsbackendftp.c 2008-11-18 10:55:23.000000000 +0100
+++ gvfs-1.0.2/daemon/gvfsbackendftp.c 2008-12-11 23:55:51.000000000 +0100
@@ -937,14 +937,13 @@
addr = soup_address_new (ip, port1 << 8 | port2);
g_free (ip);
- connected = ftp_connection_open_data_connection (conn, addr);
- if (!connected)
- {
- /* set workaround flag (see below), so we don't try this again */
- DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
- conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
- g_clear_error (&conn->error);
- }
+ if (ftp_connection_open_data_connection (conn, addr))
+ return TRUE;
+
+ /* set workaround flag (see below), so we don't try this again */
+ DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
+ conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
+ g_clear_error (&conn->error);
}
/* Workaround code:

View File

@ -1,9 +0,0 @@
diff -up gvfs-1.1.3/daemon/dav+sd.mount.dav+sd-mount gvfs-1.1.3/daemon/dav+sd.mount
--- gvfs-1.1.3/daemon/dav+sd.mount.dav+sd-mount 2009-01-12 12:29:37.000000000 -0500
+++ gvfs-1.1.3/daemon/dav+sd.mount 2009-01-12 12:29:48.000000000 -0500
@@ -1,4 +1,4 @@
[Mount]
Type=dav+sd;davs+sd
-Exec=/usr/local/libexec/gvfsd-dav
+Exec=/usr/libexec/gvfsd-dav
AutoMount=false

View File

@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib Summary: Backends for the gio framework in GLib
Name: gvfs Name: gvfs
Version: 1.1.3 Version: 1.1.4
Release: 4%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -34,9 +34,6 @@ Patch1: gvfs-0.99.2-archive-integration.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=565041 # http://bugzilla.gnome.org/show_bug.cgi?id=565041
Patch2: gvfs-burn-move.patch Patch2: gvfs-burn-move.patch
# fixed correctly upstream
Patch3: gvfs-dav+sd-mount.patch
%description %description
The gvfs package provides backend implementations for the gio The gvfs package provides backend implementations for the gio
framework in GLib. It includes ftp, sftp, cifs. framework in GLib. It includes ftp, sftp, cifs.
@ -119,7 +116,6 @@ media players (Media Transfer Protocol) to applications using gvfs.
%setup -q %setup -q
%patch1 -p0 -b .archive-integration %patch1 -p0 -b .archive-integration
%patch2 -p0 -b .burn-move %patch2 -p0 -b .burn-move
%patch3 -p1 -b .dav+sd-mount
%build %build
@ -260,6 +256,9 @@ update-desktop-database &> /dev/null ||:
%changelog %changelog
* Tue Jan 20 2009 Tomas Bzatek <tbzatek@redhat.com> - 1.1.4-1
- Update to 1.1.4
* Tue Jan 13 2009 Adrian Reber <adrian@lisas.de> - 1.1.3-4 * Tue Jan 13 2009 Adrian Reber <adrian@lisas.de> - 1.1.3-4
- Rebuild for libcdio-0.81 - Rebuild for libcdio-0.81

View File

@ -1 +1 @@
0ea4075dc9d1e3734805f5c43825c6eb gvfs-1.1.3.tar.bz2 cc539eee1b504b2dd770cce81740e08c gvfs-1.1.4.tar.bz2