From 2a5e9568737060ef147d624b249ad4a9057993f67a0d5c81fb8695f362e370a6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:49:15 +0000 Subject: [PATCH] Accepting request 25403 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gvfs via accept of submit request 25403 revision 5. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25403 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=59 --- gvfs-1.4.1.tar.bz2 | 3 --- gvfs-1.5.1.tar.bz2 | 3 +++ gvfs-dice-backend.patch | 36 ++++++++++++++++---------------- gvfs-nvvfs.patch | 34 ++++++++++++++++-------------- gvfs.changes | 34 ++++++++++++++++++++++++++++++ gvfs.spec | 46 ++++++++++++++++++++++++++++++++--------- 6 files changed, 110 insertions(+), 46 deletions(-) delete mode 100644 gvfs-1.4.1.tar.bz2 create mode 100644 gvfs-1.5.1.tar.bz2 diff --git a/gvfs-1.4.1.tar.bz2 b/gvfs-1.4.1.tar.bz2 deleted file mode 100644 index 3f56467..0000000 --- a/gvfs-1.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e281b1d173cecd53948317b73b458b3cffcf0cdaa7ee1568aa71db30c4e31ea5 -size 1249982 diff --git a/gvfs-1.5.1.tar.bz2 b/gvfs-1.5.1.tar.bz2 new file mode 100644 index 0000000..a0612ae --- /dev/null +++ b/gvfs-1.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d67a84228f80570d6f239c1c3527eeb29f844a0cc85dfea09b1d7fb50c639502 +size 1276422 diff --git a/gvfs-dice-backend.patch b/gvfs-dice-backend.patch index 22e6009..b3f21b5 100644 --- a/gvfs-dice-backend.patch +++ b/gvfs-dice-backend.patch @@ -1,10 +1,10 @@ -Index: gvfs-1.3.3/configure.ac +Index: gvfs-1.5.1/configure.ac =================================================================== ---- gvfs-1.3.3.orig/configure.ac -+++ gvfs-1.3.3/configure.ac -@@ -53,6 +53,10 @@ PKG_CHECK_MODULES(DBUS, dbus-1) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) +--- gvfs-1.5.1.orig/configure.ac ++++ gvfs-1.5.1/configure.ac +@@ -46,6 +46,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.21 + + PKG_CHECK_MODULES(DBUS, dbus-1) +PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1) +AC_SUBST(DBUS_GLIB_CFLAGS) @@ -13,10 +13,10 @@ Index: gvfs-1.3.3/configure.ac 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) DBUS_SERVICE_DIR=$with_dbus_service_dir AC_SUBST(DBUS_SERVICE_DIR) -Index: gvfs-1.3.3/daemon/dice.mount.in +Index: gvfs-1.5.1/daemon/dice.mount.in =================================================================== --- /dev/null -+++ gvfs-1.3.3/daemon/dice.mount.in ++++ gvfs-1.5.1/daemon/dice.mount.in @@ -0,0 +1,6 @@ +[Mount] +Type=dice @@ -24,10 +24,10 @@ Index: gvfs-1.3.3/daemon/dice.mount.in +AutoMount=true +DBusName=org.gtk.vfs.mountpoint.dice + -Index: gvfs-1.3.3/daemon/gvfsbackenddice.c +Index: gvfs-1.5.1/daemon/gvfsbackenddice.c =================================================================== --- /dev/null -+++ gvfs-1.3.3/daemon/gvfsbackenddice.c ++++ gvfs-1.5.1/daemon/gvfsbackenddice.c @@ -0,0 +1,1989 @@ +/* Novell DICE Backend for GVfs + * @@ -2018,10 +2018,10 @@ Index: gvfs-1.3.3/daemon/gvfsbackenddice.c +// backend_class->create_dir_monitor = do_create_dir_monitor; +// backend_class->create_file_monitor = do_create_file_monitor; +} -Index: gvfs-1.3.3/daemon/gvfsbackenddice.h +Index: gvfs-1.5.1/daemon/gvfsbackenddice.h =================================================================== --- /dev/null -+++ gvfs-1.3.3/daemon/gvfsbackenddice.h ++++ gvfs-1.5.1/daemon/gvfsbackenddice.h @@ -0,0 +1,50 @@ +/* Novell IceDesktop Backend for GVfs + * @@ -2073,16 +2073,16 @@ Index: gvfs-1.3.3/daemon/gvfsbackenddice.h +G_END_DECLS + +#endif /* __G_VFS_BACKEND_DICE_H__ */ -Index: gvfs-1.3.3/daemon/Makefile.am +Index: gvfs-1.5.1/daemon/Makefile.am =================================================================== ---- gvfs-1.3.3.orig/daemon/Makefile.am -+++ gvfs-1.3.3/daemon/Makefile.am +--- gvfs-1.5.1.orig/daemon/Makefile.am ++++ gvfs-1.5.1/daemon/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_builddir) \ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ - $(OBEXFTP_CFLAGS) $(XML_CFLAGS) \ + $(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS) \ $(KEYRING_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE \ @@ -24,7 +25,7 @@ noinst_LTLIBRARIES=libdaemon.la @@ -2096,7 +2096,7 @@ Index: gvfs-1.3.3/daemon/Makefile.am %.service: %.service.in ../config.log @@ -37,10 +38,10 @@ service_DATA = gvfs-daemon.service %.mount: %.mount.in ../config.log - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp +libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-dice @@ -2108,7 +2108,7 @@ Index: gvfs-1.3.3/daemon/Makefile.am mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in if HAVE_HTTP -@@ -286,6 +287,19 @@ gvfsd_trash_CPPFLAGS = \ +@@ -292,6 +293,19 @@ gvfsd_trash_CPPFLAGS = \ gvfsd_trash_LDADD = trashlib/libtrash.a $(libraries) diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch index 66b944e..101ad75 100644 --- a/gvfs-nvvfs.patch +++ b/gvfs-nvvfs.patch @@ -1,6 +1,7 @@ -diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.c gvfs-1.2.0/daemon/gvfsbackendnvvfs.c ---- gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.c 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/gvfsbackendnvvfs.c 2009-04-03 20:04:20.000000000 +0530 +Index: gvfs-1.5.1/daemon/gvfsbackendnvvfs.c +=================================================================== +--- /dev/null ++++ gvfs-1.5.1/daemon/gvfsbackendnvvfs.c @@ -0,0 +1,591 @@ +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* GIO - GLib Input, Output and Streaming Library @@ -593,9 +594,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.c gvfs-1.2.0/daemon/gvfsbacke + backend_class->try_query_info = try_query_info; + backend_class->try_enumerate = try_enumerate; +} -diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.h gvfs-1.2.0/daemon/gvfsbackendnvvfs.h ---- gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.h 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/gvfsbackendnvvfs.h 2009-04-03 19:51:07.000000000 +0530 +Index: gvfs-1.5.1/daemon/gvfsbackendnvvfs.h +=================================================================== +--- /dev/null ++++ gvfs-1.5.1/daemon/gvfsbackendnvvfs.h @@ -0,0 +1,50 @@ +/* GIO - GLib Input, Output and Streaming Library + * @@ -647,11 +649,12 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.h gvfs-1.2.0/daemon/gvfsbacke +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NVVFS_H__ */ -diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am ---- gvfs-1.2.0.orig/daemon/Makefile.am 2009-04-03 20:24:16.000000000 +0530 -+++ gvfs-1.2.0/daemon/Makefile.am 2009-04-03 20:20:55.000000000 +0530 -@@ -101,6 +101,10 @@ mount_DATA += archive.mount - libexec_PROGRAMS += gvfsd-archive +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 endif +mount_in_files += nvvfs.mount.in @@ -661,7 +664,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 DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) -@@ -402,6 +406,20 @@ gvfsd_http_CPPFLAGS = \ +@@ -438,6 +442,20 @@ gvfsd_http_CPPFLAGS = \ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) @@ -682,9 +685,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am gvfsd_dav_SOURCES = \ soup-input-stream.c soup-input-stream.h \ soup-output-stream.c soup-output-stream.h \ -diff -Nupr gvfs-1.2.0.orig/daemon/nvvfs.mount.in gvfs-1.2.0/daemon/nvvfs.mount.in ---- gvfs-1.2.0.orig/daemon/nvvfs.mount.in 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/nvvfs.mount.in 2009-04-03 19:51:07.000000000 +0530 +Index: gvfs-1.5.1/daemon/nvvfs.mount.in +=================================================================== +--- /dev/null ++++ gvfs-1.5.1/daemon/nvvfs.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nvvfs diff --git a/gvfs.changes b/gvfs.changes index 86390c3..8267346 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Dec 2 14:23:58 CET 2009 - vuntz@opensuse.org + +- Update to version 1.5.1: + + FreeBSD support for the gphoto2 backend + + Don't show ssh dns-sd items in dns-sd:, only sftp ones + + New AFC backend, providing access to Apple's iPhone, and iPod + Touch devices + + Don't silently overwrite when restoring from trash + + Don't subscribe to unnecessary HAL D-Bus events + + Avoid error dialogs when the user canceled + + Don't confuse media players for cameras + + Support for loading icon and title on Blu-ray video discs + + gdu: + - Consider logical partitions when determining if a drive + should be ignored + - Separated "Safely Remove Drive" from "Eject" + - Disallow mounting/ejecting empty drives + - Handle NULL device objects + + obexftp: + - Fix a crash in the backend + - Delete source file after move (remove_source switch) + + http: + - Support querying input streams + - Store and use cookies + + smb: + - Support querying filesystem size and free space + + ftp: + - Fixed parsing of CMU/VMS-IP FTP style listing + + Bugs fixed: bgo#595981, bgo#596867, bgo#517014, bgo#593045, + bgo#594928, bgo#586724, bgo#586729, bgo#597104, bgo#580825 + + Translation updates +- Rebase gvfs-dice-backend.patch and gvfs-nvvfs.patch. + ------------------------------------------------------------------- Sat Nov 14 16:48:41 CET 2009 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index eb37734..c07e587 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.4.1) +# spec file for package gvfs (Version 1.5.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,8 @@ Name: gvfs -Version: 1.4.1 +Version: 1.5.1 +# FIXME add libiphone-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory) Release: 1 License: LGPL v2.0 or later Summary: VFS functionality for GLib @@ -140,7 +141,9 @@ rm -rf %{buildroot} %doc AUTHORS NEWS README TODO %{_bindir}/* %{_datadir}/dbus-1/services/*.service -%{_datadir}/gvfs +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/mounts +%dir %{_datadir}/%{name}/remote-volume-monitors %{_libdir}/gio/modules/*.so %dir %{_libdir}/%{name} %{_libdir}/%{name}/gvfsd @@ -154,29 +157,52 @@ rm -rf %{buildroot} %defattr(-, root, root) %if %suse_version > 1110 %{_libdir}/%{name}/gvfs-gdu-volume-monitor +%{_datadir}/%{name}/remote-volume-monitors/gdu.monitor %endif %{_libdir}/%{name}/gvfs-gphoto2-volume-monitor +%{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor %{_libdir}/%{name}/gvfs-hal-volume-monitor +%{_datadir}/%{name}/remote-volume-monitors/hal.monitor %{_libdir}/%{name}/gvfsd-archive +%{_datadir}/%{name}/mounts/archive.mount %{_libdir}/%{name}/gvfsd-burn +%{_datadir}/%{name}/mounts/burn.mount %{_libdir}/%{name}/gvfsd-cdda +%{_datadir}/%{name}/mounts/cdda.mount %{_libdir}/%{name}/gvfsd-computer +%{_datadir}/%{name}/mounts/computer.mount %{_libdir}/%{name}/gvfsd-dav +%{_datadir}/%{name}/mounts/dav.mount +%{_datadir}/%{name}/mounts/dav+sd.mount %{_libdir}/%{name}/gvfsd-dice +%{_datadir}/%{name}/mounts/dice.mount %{_libdir}/%{name}/gvfsd-dnssd +%{_datadir}/%{name}/mounts/dns-sd.mount %{_libdir}/%{name}/gvfsd-ftp +%{_datadir}/%{name}/mounts/ftp.mount %{_libdir}/%{name}/gvfsd-gphoto2 +%{_datadir}/%{name}/mounts/gphoto2.mount %{_libdir}/%{name}/gvfsd-http +%{_datadir}/%{name}/mounts/http.mount %{_libdir}/%{name}/gvfsd-localtest +%{_datadir}/%{name}/mounts/localtest.mount %{_libdir}/%{name}/gvfsd-metadata -%{_libdir}/%{name}/gvfsd-network -%{_libdir}/%{name}/gvfsd-obexftp -%{_libdir}/%{name}/gvfsd-sftp -%{_libdir}/%{name}/gvfsd-smb -%{_libdir}/%{name}/gvfsd-smb-browse -%{_libdir}/%{name}/gvfsd-trash -%{_libdir}/%{name}/gvfsd-nvvfs %{_libdir}/%{name}/gvfsd-nds +%{_datadir}/%{name}/mounts/nds.mount +%{_libdir}/%{name}/gvfsd-network +%{_datadir}/%{name}/mounts/network.mount +%{_libdir}/%{name}/gvfsd-nvvfs +%{_datadir}/%{name}/mounts/nvvfs.mount +%{_libdir}/%{name}/gvfsd-obexftp +%{_datadir}/%{name}/mounts/obexftp.mount +%{_libdir}/%{name}/gvfsd-sftp +%{_datadir}/%{name}/mounts/sftp.mount +%{_libdir}/%{name}/gvfsd-smb +%{_datadir}/%{name}/mounts/smb.mount +%{_libdir}/%{name}/gvfsd-smb-browse +%{_datadir}/%{name}/mounts/smb-browse.mount +%{_libdir}/%{name}/gvfsd-trash +%{_datadir}/%{name}/mounts/trash.mount %files -n libgvfscommon0 %defattr(-, root, root)