Accepting request 78969 from home:dimstar:branches:GNOME:Factory

Updaye to 1.9.3

OBS-URL: https://build.opensuse.org/request/show/78969
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=114
This commit is contained in:
Marcus Rückert 2011-08-17 21:09:21 +00:00 committed by Git OBS Bridge
parent 2b5cd09e32
commit cc3edb9528
5 changed files with 16 additions and 42 deletions

View File

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

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

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

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

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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.3
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,7 +34,7 @@ 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
@ -115,7 +113,6 @@ VFS functionality for GLib.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%patch5 -p1
%patch6 -p1
autoreconf -f