diff --git a/gvfs-1.9.1.tar.bz2 b/gvfs-1.9.1.tar.bz2 deleted file mode 100644 index 0b99639..0000000 --- a/gvfs-1.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29058c29fd27822ccb16c80edfe52762c7f53e67fedd3c3b79a42555ee93239a -size 1433985 diff --git a/gvfs-1.9.2.tar.bz2 b/gvfs-1.9.2.tar.bz2 new file mode 100644 index 0000000..12b3be9 --- /dev/null +++ b/gvfs-1.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc244a45e0bf39e8168a1d4827a16ad40bbba8a2e2bf064d9b5429ce59462052 +size 1448204 diff --git a/gvfs-g_format_size.patch b/gvfs-g_format_size.patch new file mode 100644 index 0000000..ef1e089 --- /dev/null +++ b/gvfs-g_format_size.patch @@ -0,0 +1,34 @@ +commit ab7b527c5324a81271915271ae1ce20ba9964225 +Author: Vincent Untz +Date: Thu Jul 28 08:56:13 2011 +0200 + + gvfs-copy: Do not use deprecated g_format_size_for_display() + + https://bugzilla.gnome.org/show_bug.cgi?id=655474 + +diff --git a/configure.ac b/configure.ac +index 870415e..3c6d5b3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,7 @@ GTK_DOC_CHECK + DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc" + AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) + +-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.27.4 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ) ++PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.29.14 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 ) + + PKG_CHECK_MODULES(DBUS, dbus-1) + +diff --git a/programs/gvfs-copy.c b/programs/gvfs-copy.c +index 90b8821..9caf779 100644 +--- a/programs/gvfs-copy.c ++++ b/programs/gvfs-copy.c +@@ -74,7 +74,7 @@ show_progress (goffset current_num_bytes, + + g_get_current_time (&tv); + +- size = g_format_size_for_display (current_num_bytes / MAX (tv.tv_sec - start_time.tv_sec, 1)); ++ size = g_format_size (current_num_bytes / MAX (tv.tv_sec - start_time.tv_sec, 1)); + g_print (_("progress")); + g_print (" %"G_GINT64_FORMAT"/%"G_GINT64_FORMAT" (%s/s)\n", + current_num_bytes, total_num_bytes, size); diff --git a/gvfs.changes b/gvfs.changes index 31db7cc..86e9558 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jul 28 09:03:07 CEST 2011 - vuntz@opensuse.org + +- Update to version 1.9.2: + + ftp: Fix stupid proxy servers disconnecting on FEAT + + gdu: Respect UDISKS_AUTOMOUNT_HINT available in recent udisks + and gnome-disk-utility + + build: Lower AC_PREREQ requirement + + Updated translations. +- Add gvfs-g_format_size.patch: do not use deprecated API to fix + build. + ------------------------------------------------------------------- Fri Jul 1 11:10:33 CEST 2011 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index f8430d2..5718a72 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -18,15 +18,17 @@ Name: gvfs -Version: 1.9.1 +Version: 1.9.2 Release: 1 # FIXME: add libbluray BuildRequires once available (fate#312440) License: LGPLv2.0+ Summary: VFS functionality for GLib Url: http://www.gnome.org Group: Development/Libraries/C and C++ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gvfs/1.9/%{name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gvfs-g_format_size.patch bgo#655474 vuntz@opensuse.org -- Do not use deprecated glib API to fix build +Patch0: gvfs-g_format_size.patch # PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin Patch5: gvfs-nvvfs.patch # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus @@ -113,6 +115,7 @@ VFS functionality for GLib. %prep %setup -q translation-update-upstream +%patch0 -p1 %patch5 -p1 %patch6 -p1 autoreconf -f