Accepting request 33964 from GNOME:Factory

Copy from GNOME:Factory/gvfs based on submit request 33964 from user dimstar

OBS-URL: https://build.opensuse.org/request/show/33964
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=50
This commit is contained in:
OBS User autobuild 2010-03-05 01:18:09 +00:00 committed by Git OBS Bridge
commit 93ff01e4bc
7 changed files with 76 additions and 41 deletions

View File

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

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

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

View File

@ -1,8 +1,8 @@
diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c Index: gvfs-1.5.4/gconf/gapplookupgconf.c
index 059659d..75e3b32 100644 ===================================================================
--- a/gconf/gapplookupgconf.c --- gvfs-1.5.4.orig/gconf/gapplookupgconf.c
+++ b/gconf/gapplookupgconf.c +++ gvfs-1.5.4/gconf/gapplookupgconf.c
@@ -114,6 +114,9 @@ get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, @@ -107,6 +107,9 @@ get_default_for_uri_scheme (GDesktopAppI
appinfo = NULL; appinfo = NULL;

View File

@ -1,8 +1,8 @@
Index: gvfs-1.5.1/configure.ac Index: gvfs-1.5.4/configure.ac
=================================================================== ===================================================================
--- gvfs-1.5.1.orig/configure.ac --- gvfs-1.5.4.orig/configure.ac
+++ gvfs-1.5.1/configure.ac +++ gvfs-1.5.4/configure.ac
@@ -46,6 +46,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.21 @@ -47,6 +47,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.23
PKG_CHECK_MODULES(DBUS, dbus-1) PKG_CHECK_MODULES(DBUS, dbus-1)
@ -10,13 +10,13 @@ Index: gvfs-1.5.1/configure.ac
+AC_SUBST(DBUS_GLIB_CFLAGS) +AC_SUBST(DBUS_GLIB_CFLAGS)
+AC_SUBST(DBUS_GLIB_LIBS) +AC_SUBST(DBUS_GLIB_LIBS)
+ +
AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=PATH choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) AC_ARG_WITH(dbus_service_dir,
DBUS_SERVICE_DIR=$with_dbus_service_dir AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files]),
AC_SUBST(DBUS_SERVICE_DIR) [default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
Index: gvfs-1.5.1/daemon/dice.mount.in Index: gvfs-1.5.4/daemon/dice.mount.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gvfs-1.5.1/daemon/dice.mount.in +++ gvfs-1.5.4/daemon/dice.mount.in
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+[Mount] +[Mount]
+Type=dice +Type=dice
@ -24,10 +24,10 @@ Index: gvfs-1.5.1/daemon/dice.mount.in
+AutoMount=true +AutoMount=true
+DBusName=org.gtk.vfs.mountpoint.dice +DBusName=org.gtk.vfs.mountpoint.dice
+ +
Index: gvfs-1.5.1/daemon/gvfsbackenddice.c Index: gvfs-1.5.4/daemon/gvfsbackenddice.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gvfs-1.5.1/daemon/gvfsbackenddice.c +++ gvfs-1.5.4/daemon/gvfsbackenddice.c
@@ -0,0 +1,1989 @@ @@ -0,0 +1,1989 @@
+/* Novell DICE Backend for GVfs +/* Novell DICE Backend for GVfs
+ * + *
@ -2018,10 +2018,10 @@ Index: gvfs-1.5.1/daemon/gvfsbackenddice.c
+// backend_class->create_dir_monitor = do_create_dir_monitor; +// backend_class->create_dir_monitor = do_create_dir_monitor;
+// backend_class->create_file_monitor = do_create_file_monitor; +// backend_class->create_file_monitor = do_create_file_monitor;
+} +}
Index: gvfs-1.5.1/daemon/gvfsbackenddice.h Index: gvfs-1.5.4/daemon/gvfsbackenddice.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gvfs-1.5.1/daemon/gvfsbackenddice.h +++ gvfs-1.5.4/daemon/gvfsbackenddice.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* Novell IceDesktop Backend for GVfs +/* Novell IceDesktop Backend for GVfs
+ * + *
@ -2073,10 +2073,10 @@ Index: gvfs-1.5.1/daemon/gvfsbackenddice.h
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __G_VFS_BACKEND_DICE_H__ */ +#endif /* __G_VFS_BACKEND_DICE_H__ */
Index: gvfs-1.5.1/daemon/Makefile.am Index: gvfs-1.5.4/daemon/Makefile.am
=================================================================== ===================================================================
--- gvfs-1.5.1.orig/daemon/Makefile.am --- gvfs-1.5.4.orig/daemon/Makefile.am
+++ gvfs-1.5.1/daemon/Makefile.am +++ gvfs-1.5.4/daemon/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \ @@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_builddir) \ -I$(top_builddir) \

View File

@ -1,6 +1,7 @@
diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackendnds.c Index: gvfs-1.5.4/daemon/gvfsbackendnds.c
--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.c 1970-01-01 05:30:00.000000000 +0530 ===================================================================
+++ gvfs-1.2.0/daemon/gvfsbackendnds.c 2009-04-03 20:14:07.000000000 +0530 --- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.c
@@ -0,0 +1,753 @@ @@ -0,0 +1,753 @@
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
+ * + *
@ -755,9 +756,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackend
+{ +{
+ g_set_application_name (_("Displaying Embedded Objects")); + g_set_application_name (_("Displaying Embedded Objects"));
+} +}
diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackendnds.h Index: gvfs-1.5.4/daemon/gvfsbackendnds.h
--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.h 1970-01-01 05:30:00.000000000 +0530 ===================================================================
+++ gvfs-1.2.0/daemon/gvfsbackendnds.h 2009-04-03 19:51:07.000000000 +0530 --- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.h
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
+ * + *
@ -812,10 +814,11 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackend
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __G_VFS_BACKEND_NDS_H__ */ +#endif /* __G_VFS_BACKEND_NDS_H__ */
diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am Index: gvfs-1.5.4/daemon/Makefile.am
--- gvfs-1.2.0.orig/daemon/Makefile.am 2009-04-03 20:08:22.000000000 +0530 ===================================================================
+++ gvfs-1.2.0/daemon/Makefile.am 2009-04-03 19:51:07.000000000 +0530 --- gvfs-1.5.4.orig/daemon/Makefile.am
@@ -105,6 +105,10 @@ mount_in_files += nvvfs.mount.in +++ gvfs-1.5.4/daemon/Makefile.am
@@ -112,6 +112,10 @@ mount_in_files += nvvfs.mount.in
mount_DATA += nvvfs.mount mount_DATA += nvvfs.mount
libexec_PROGRAMS += gvfsd-nvvfs libexec_PROGRAMS += gvfsd-nvvfs
@ -826,7 +829,7 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -406,6 +410,19 @@ gvfsd_http_CPPFLAGS = \ @@ -442,6 +446,19 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
@ -846,9 +849,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
gvfsd_nvvfs_SOURCES = \ gvfsd_nvvfs_SOURCES = \
gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
daemon-main.c daemon-main.h \ daemon-main.c daemon-main.h \
diff -Nupr gvfs-1.2.0.orig/daemon/nds.mount.in gvfs-1.2.0/daemon/nds.mount.in Index: gvfs-1.5.4/daemon/nds.mount.in
--- gvfs-1.2.0.orig/daemon/nds.mount.in 1970-01-01 05:30:00.000000000 +0530 ===================================================================
+++ gvfs-1.2.0/daemon/nds.mount.in 2009-04-03 19:51:07.000000000 +0530 --- /dev/null
+++ gvfs-1.5.4/daemon/nds.mount.in
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+[Mount] +[Mount]
+Type=nds +Type=nds

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Wed Feb 24 12:15:22 CET 2010 - dimstar@opensuse.org
- Update to version 1.5.4:
+ gphoto2: Better support for devices that are read-only + delete
+ gdu: Various fixes and preparation for LVM
+ ftp: fix asserts
+ sftp: remember to save password if username changed
+ gio module: don't call g_file_find_enclosing_mount_async
callback directly
+ gvfs-monitor: Track moves if availible
+ Translation updates
- Rebase gvfs-dice-backend.patch, gvfs-nds.patch and
gvfs-429959-handle-blank-schemas.patch
- Drop gvfs-no-querymodule-on-install.patch, upstream included.
-------------------------------------------------------------------
Sun Feb 14 18:39:40 CET 2010 - vuntz@opensuse.org
- Add gvfs-no-querymodule-on-install.patch to fix build.
-------------------------------------------------------------------
Fri Feb 12 14:17:13 CET 2010 - dimstar@opensuse.org
- Update to version 1.5.3:
+ afc: Update for libimobiledevice (rename of libiphone)
+ ftp: Handle cases where symlink target is not defined
+ ftp: Prefer PASV/PORT to EPSV/EPRT for IPv4, the latter for
IPv6
+ Translation updates.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 28 12:13:09 CET 2010 - vuntz@opensuse.org Thu Jan 28 12:13:09 CET 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
# #
# spec file for package gvfs (Version 1.5.2) # spec file for package gvfs (Version 1.5.4)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,9 +18,9 @@
Name: gvfs Name: gvfs
Version: 1.5.2 Version: 1.5.4
Release: 1 Release: 1
# FIXME add libiphone-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory) # FIXME add libimobiledevice-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory)
License: LGPLv2.0+ License: LGPLv2.0+
Summary: VFS functionality for GLib Summary: VFS functionality for GLib
Url: http://www.gnome.org Url: http://www.gnome.org