From 863072947f8c280c10fbe1d89e20681eab0a5f2bcdaf7be727be042a3f51f627 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 26 Oct 2015 10:38:20 +0000 Subject: [PATCH] Accepting request 340796 from GNOME:Next Lets kick this one along too :-) OBS-URL: https://build.opensuse.org/request/show/340796 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=218 --- gvfs-1.26.0.tar.xz | 3 --- gvfs-1.26.1.1.tar.xz | 3 +++ gvfs.changes | 24 ++++++++++++++++++++++++ gvfs.spec | 40 +++++++++++++++++++++++++++------------- 4 files changed, 54 insertions(+), 16 deletions(-) delete mode 100644 gvfs-1.26.0.tar.xz create mode 100644 gvfs-1.26.1.1.tar.xz diff --git a/gvfs-1.26.0.tar.xz b/gvfs-1.26.0.tar.xz deleted file mode 100644 index f397278..0000000 --- a/gvfs-1.26.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d43e8b33a5c1588525875f9d3979b515f648da1d567d0ce3d337a18f5ff8c32 -size 1673092 diff --git a/gvfs-1.26.1.1.tar.xz b/gvfs-1.26.1.1.tar.xz new file mode 100644 index 0000000..4d7e8b9 --- /dev/null +++ b/gvfs-1.26.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dadf986e464db1d7f007b178a5432b30ba93ef0cb31a2795156540d496dc06d +size 1678836 diff --git a/gvfs.changes b/gvfs.changes index 32d6245..5500993 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Oct 15 09:28:18 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.26.1.1: + + file monitor: Fix crashes caused by invalid read. + +------------------------------------------------------------------- +Wed Oct 14 08:54:19 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.26.1: + + proxyvolumemonitor: Fix crashes when drives/volumes/mounts + caches are changed. + + Add a corresponding systemd user service for every D-Bus + session service. + + google: Report progress when copying and moving. + + ftp: Return correct file info for absolute symlink paths. + + sftp: + - Fix crashes when force unmount is proceeded. + - Fix crashes when data connection setup failed. + + Several smaller bugfixes. + + Updated translations. +- Disable gvfs-nds.patch & gvfs-nvvfs.patch: Needs rebase, also + disable gnome-common BuildRequires and stop passing NOCONFIGURE. + ------------------------------------------------------------------- Tue Sep 22 07:02:24 UTC 2015 - dimstar@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index cb178ef..2633935 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -20,7 +20,7 @@ %define with_cdda 1 Name: gvfs -Version: 1.26.0 +Version: 1.26.1.1 Release: 0 Summary: VFS functionality for GLib License: LGPL-2.0+ @@ -28,13 +28,14 @@ Group: Development/Libraries/C and C++ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/gvfs/1.26/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin +# PATCH-NEEDS-REBASE was: # 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 +# PATCH-NEEDS-REBASE was: # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus Patch6: gvfs-nds.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fuse-devel -BuildRequires: gnome-common +# Only needed for patch 5 & 6 - disabled for now +#BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libarchive-devel BuildRequires: libavahi-glib-devel @@ -128,11 +129,13 @@ VFS functionality for GLib. %prep %setup -q translation-update-upstream -%patch5 -p1 -%patch6 -p1 +# Patch 5 & 6 disabled - needs rebase +#patch5 -p1 +#patch6 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh +# Only needed for patch 5 & 6 - disabled +#NOCONFIGURE=1 gnome-autogen.sh %configure \ --libexecdir=%{_libexecdir}/%{name} \ %if %{with_udisks2} @@ -178,9 +181,9 @@ rm -rf %{buildroot} %{_libdir}/gvfs/libgvfsdaemon.so %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvfsd -%{_datadir}/dbus-1/services/gvfs-daemon.service +%{_datadir}/dbus-1/services/org.gtk.vfs.Daemon.service %{_libexecdir}/%{name}/gvfsd-metadata -%{_datadir}/dbus-1/services/gvfs-metadata.service +%{_datadir}/dbus-1/services/org.gtk.vfs.Metadata.service %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/ @@ -188,6 +191,10 @@ rm -rf %{buildroot} %{_mandir}/man1/gvfsd.1%{?ext_man} %{_mandir}/man1/gvfsd-metadata.1%{?ext_man} %{_mandir}/man7/gvfs.7%{?ext_man} +%dir %{_libexecdir}/systemd +%dir %{_libexecdir}/systemd/user +%{_libexecdir}/systemd/user/gvfs-daemon.service +%{_libexecdir}/systemd/user/gvfs-metadata.service %files fuse %defattr(-, root, root) @@ -200,6 +207,7 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_libexecdir}/%{name}/gvfs-afc-volume-monitor %{_datadir}/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service +%{_libexecdir}/systemd/user/gvfs-afc-volume-monitor.service %{_datadir}/%{name}/remote-volume-monitors/afc.monitor %{_libexecdir}/%{name}/gvfsd-afc %{_datadir}/%{name}/mounts/afc.mount @@ -211,12 +219,14 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service %{_datadir}/%{name}/remote-volume-monitors/udisks2.monitor %{_libexecdir}/%{name}/gvfs-udisks2-volume-monitor +%{_libexecdir}/systemd/user/gvfs-udisks2-volume-monitor.service %else %{_libexecdir}/%{name}/gvfs-gdu-volume-monitor %{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service %{_datadir}/%{name}/remote-volume-monitors/gdu.monitor %endif %{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor +%{_libexecdir}/systemd/user/gvfs-gphoto2-volume-monitor.service %{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service %{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor %{_libexecdir}/%{name}/gvfsd-afp @@ -248,21 +258,25 @@ rm -rf %{buildroot} %{_libexecdir}/%{name}/gvfsd-http %{_datadir}/%{name}/mounts/http.mount %{_libexecdir}/%{name}/gvfs-goa-volume-monitor +%{_libexecdir}/systemd/user/gvfs-goa-volume-monitor.service %{_datadir}/%{name}/remote-volume-monitors/goa.monitor %{_datadir}/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service %{_libexecdir}/%{name}/gvfsd-localtest %{_datadir}/%{name}/mounts/localtest.mount %{_libexecdir}/%{name}/gvfsd-mtp %{_libexecdir}/%{name}/gvfs-mtp-volume-monitor +%{_libexecdir}/systemd/user/gvfs-mtp-volume-monitor.service %{_datadir}/%{name}/remote-volume-monitors/mtp.monitor %{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service %{_datadir}/%{name}/mounts/mtp.mount -%{_libexecdir}/%{name}/gvfsd-nds -%{_datadir}/%{name}/mounts/nds.mount +# disabled - patch rebase +#{_libexecdir}/%{name}/gvfsd-nds +#{_datadir}/%{name}/mounts/nds.mount %{_libexecdir}/%{name}/gvfsd-network %{_datadir}/%{name}/mounts/network.mount -%{_libexecdir}/%{name}/gvfsd-nvvfs -%{_datadir}/%{name}/mounts/nvvfs.mount +# disabled - patch rebase +#{_libexecdir}/%{name}/gvfsd-nvvfs +#{_datadir}/%{name}/mounts/nvvfs.mount %{_libexecdir}/%{name}/gvfsd-recent %{_datadir}/%{name}/mounts/recent.mount %{_libexecdir}/%{name}/gvfsd-sftp