Accepting request 81513 from GNOME:Factory

Pushing most of G:F

OBS-URL: https://build.opensuse.org/request/show/81513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=70
This commit is contained in:
Sascha Peilicke 2011-09-09 09:26:28 +00:00 committed by Git OBS Bridge
commit fec1a149f7
6 changed files with 51 additions and 44 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc244a45e0bf39e8168a1d4827a16ad40bbba8a2e2bf064d9b5429ce59462052
size 1448204

3
gvfs-1.9.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc064a40dadcb15c26aaf1423f1fb5c4dcbc8d9cc6fe003250839a68e35132b5
size 1522145

View File

@ -1,34 +0,0 @@
commit ab7b527c5324a81271915271ae1ce20ba9964225
Author: Vincent Untz <vuntz@gnome.org>
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);

View File

@ -653,8 +653,8 @@ Index: gvfs-1.5.1/daemon/Makefile.am
===================================================================
--- gvfs-1.5.1.orig/daemon/Makefile.am
+++ gvfs-1.5.1/daemon/Makefile.am
@@ -108,6 +108,10 @@ mount_DATA += afc.mount
libexec_PROGRAMS += gvfsd-afc
@@ -108,6 +108,10 @@ mount_DATA += afp-browse.mount afp.mount
libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp
endif
+mount_in_files += nvvfs.mount.in

View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Mon Sep 5 18:38:39 UTC 2011 - vuntz@opensuse.org
- Update to version 1.9.5:
+ dav: Fix small memory leak
+ gdu: Don't ignore fstab mounts belonging to crypto volumes
+ smb: Always check for existing file on rename
+ Updated translations.
-------------------------------------------------------------------
Wed Aug 31 16:25:58 CEST 2011 - vuntz@opensuse.org
- Update to version 1.9.4:
+ Brand new AFP backend
+ Fixed several leaks of GSimpleAsyncResult objects
+ Added simple gvfs-mime test application
+ daemon: Ignore SIGPIPE signals to avoid process termination on
cancelled transfer
+ computer: Use 'drive-harddisk-system' as File System icon
+ ftp: Fix return value of try_get_settable_attributes() on
failure
+ gvfs-open: Exit with error code > 0 when open fails
+ String tweaks
+ Updated translations.
- Add libgcrypt-devel BuildRequires: new dependency for the AFP
backend.
- Rebase gvfs-nvvfs.patch.
-------------------------------------------------------------------
Mon Aug 15 19:37:07 CEST 2011 - dimstar@opensuse.org
- Update to version 1.9.3:
+ gvfs-copy: Do not use deprecated g_format_size_for_display()
+ fuse: Bring back real statfs()
+ Fixed several obvious programming errors found during code
analysis
+ Updated translations.
- Drop gvfs-g_format_size.patch: fixed upstream.
-------------------------------------------------------------------
Thu Jul 28 09:03:07 CEST 2011 - vuntz@opensuse.org

View File

@ -18,7 +18,7 @@
Name: gvfs
Version: 1.9.2
Version: 1.9.5
Release: 1
# FIXME: add libbluray BuildRequires once available (fate#312440)
License: LGPLv2.0+
@ -27,8 +27,6 @@ Url: http://www.gnome.org
Group: Development/Libraries/C and C++
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
@ -36,12 +34,13 @@ Patch6: gvfs-nds.patch
BuildRequires: bluez-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: fuse-devel
BuildRequires: glib2-devel
BuildRequires: glib2-devel >= 2.29.14
BuildRequires: intltool
BuildRequires: libarchive-devel
BuildRequires: libavahi-glib-devel
BuildRequires: libcdio-devel
BuildRequires: libexpat-devel
BuildRequires: libgcrypt-devel
BuildRequires: libgdu-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libgphoto2-devel
@ -115,7 +114,6 @@ VFS functionality for GLib.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%patch5 -p1
%patch6 -p1
autoreconf -f
@ -194,6 +192,10 @@ rm -rf %{buildroot}
%{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor
%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
%{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor
%{_libexecdir}/%{name}/gvfsd-afp
%{_datadir}/%{name}/mounts/afp.mount
%{_libexecdir}/%{name}/gvfsd-afp-browse
%{_datadir}/%{name}/mounts/afp-browse.mount
%{_libexecdir}/%{name}/gvfsd-archive
%{_datadir}/%{name}/mounts/archive.mount
%{_libexecdir}/%{name}/gvfsd-burn