Accepting request 638485 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/638485
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=317

gvfs-1.36.2.tar.xz

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

gvfs-1.38.1.tar.xz

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

gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch

@@ -1,67 +0,0 @@
-From 3f6f906c7c7b28dc30edb98200b6e13e1a513bb4 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Wed, 9 May 2018 12:54:59 +0200
-Subject: [PATCH] smb: Use O_RDWR to fix fstat when writing
-
-fstat fails with EINVAL on Windows servers if O_WRONLY is used to open
-(though it works properly on SAMBA servers). O_RDWR is needed to make
-it work. This causes issues when copying files over gvfsd-fuse among
-others.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=795805
----
- daemon/gvfsbackendsmb.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
-index d4944197..9571fa0d 100644
---- a/daemon/gvfsbackendsmb.c
-+++ b/daemon/gvfsbackendsmb.c
-@@ -808,7 +808,7 @@ do_create (GVfsBackend *backend,
-   smbc_open = smbc_getFunctionOpen (op_backend->smb_context);
-   errno = 0;
-   file = smbc_open (op_backend->smb_context, uri,
--		    O_CREAT|O_WRONLY|O_EXCL, 0666);
-+                    O_CREAT|O_RDWR|O_EXCL, 0666);
-   g_free (uri);
- 
-   if (file == NULL)
-@@ -850,7 +850,7 @@ do_append_to (GVfsBackend *backend,
-   smbc_open = smbc_getFunctionOpen (op_backend->smb_context);
-   errno = 0;
-   file = smbc_open (op_backend->smb_context, uri,
--					O_CREAT|O_WRONLY|O_APPEND, 0666);
-+                    O_CREAT|O_RDWR|O_APPEND, 0666);
-   g_free (uri);
- 
-   if (file == NULL)
-@@ -916,7 +916,7 @@ open_tmpfile (GVfsBackendSmb *backend,
-     smbc_open = smbc_getFunctionOpen (backend->smb_context);
-     errno = 0;
-     file = smbc_open (backend->smb_context, tmp_uri,
--		      O_CREAT|O_WRONLY|O_EXCL, 0666);
-+                      O_CREAT|O_RDWR|O_EXCL, 0666);
-   } while (file == NULL && errno == EEXIST);
- 
-   g_free (dir_uri);
-@@ -1040,7 +1040,7 @@ do_replace (GVfsBackend *backend,
-   
-   errno = 0;
-   file = smbc_open (op_backend->smb_context, uri,
--		    O_CREAT|O_WRONLY|O_EXCL, 0);
-+                    O_CREAT|O_RDWR|O_EXCL, 0);
-   if (file == NULL && errno != EEXIST)
-     {
-       int errsv = fixup_open_errno (errno);
-@@ -1110,7 +1110,7 @@ do_replace (GVfsBackend *backend,
- 	  
- 	  errno = 0;
- 	  file = smbc_open (op_backend->smb_context, uri,
--			    O_CREAT|O_WRONLY|O_TRUNC, 0);
-+                            O_CREAT|O_RDWR|O_TRUNC, 0);
- 	  if (file == NULL)
- 	    {
-               int errsv = fixup_open_errno (errno);
--- 
-2.13.7
-

gvfs.changes

@@ -1,15 +1,89 @@
+-------------------------------------------------------------------
+Wed Sep 26 16:31:00 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.38.1:
+  + gphoto2: Fix mounting for devices with special chars in
+    ID_SERIAL.
+  + mtp: Fix mounting for devices with special chars in ID_SERIAL.
+  + smbbrowse: Force NT1 protocol version for workgroup support.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Changes from version 1.38.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 28 22:51:08 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.37.92:
+  + udisks2: Use loop backing file as description for unlock.
+  + Remove workaround for directory / folder icons.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Jul 31 06:35:14 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.37.90:
+  + ftp: Add implicit TLS mode.
+  + dav: Increase max number of connections to prevent lockups.
+  + smb: Do not claim that mountable can be unmounted.
+  + build: Add proper linker support check.
+  + Several smaller bugfixes.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Jul 23 11:11:40 UTC 2018 - dimstar@opensuse.org
 
 - Help translation-update-upstream finding the right gettext domain
   name: pass "po %{name}" to the call.
 
+-------------------------------------------------------------------
+Sat Jun  9 03:05:53 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 1.37.2:
+  + smb: Fix removal of non-empty dir.
+  + programs: Remove deprecated gvfs utils.
+  + gdu: Remove libgdu support.
+  + gphoto2: Switch to a stable device uri
+  + mtp: Switch to a stable device uri.
+  + Several smaller bugfixes.
+  + Updated translation.
+- Drop:
+  + pkgconfig(gdu) BuildRequires and gdu/udisks2-related
+    conditionals to follow upstream changes.
+  + gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch: fixed
+    upstream.
+
 -------------------------------------------------------------------
 Fri Jun  8 09:38:55 UTC 2018 - fezhang@suse.com
 
 - Add gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch: Fix
   failures copying files on smb mounts (bgo#795805 boo#1096476).
 
+-------------------------------------------------------------------
+Sun May 13 22:51:51 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 1.37.1:
+  + udisks2: Remove optical disc volumes/mounts if drive
+    disappears.
+  + daemon: Prevent deadlock and invalid read when closing
+    channels.
+  + metadata: Prevent usage of NULL if GUdevDevice is not found.
+  + mtp: Implement support for move and copy operations.
+  + backend: Fix crashes when "Volume is busy" prompt is shown.
+  + Several smaller bugfixes.
+  + Updated translation.
+- Drop pkgconfig(gmodule-no-export-2.0) BuildRequires to follow
+  upstream changes.
+- Add:
+  + pkgconfig(dbus-1) BuildRequires to avoid implicit dependencies.
+  + pkgconfig(gdu) BuildRequires under the without-udisks
+    condition: gnome disk utility package is built with udisks2
+    support and the former requires the last.
+- Switch fuse, libavahi-glib, libarchive, libimobiledevice,
+  libgphoto2, libgdu and libsoup devel package BuildRequires to
+  their pkconfig module counterparts: they are what meson actually
+  is looking for.
+
 -------------------------------------------------------------------
 Mon May  7 09:55:50 UTC 2018 - bjorn.lie@gmail.com
 

gvfs.spec

@@ -12,74 +12,69 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define with_udisks2 1
+%bcond_without  cdda
-%define with_cdda 1
 Name:           gvfs
-Version:        1.36.2
+Version:        1.38.1
 Release:        0
 Summary:        Virtual File System functionality for GLib
 License:        LGPL-2.0-or-later AND GPL-3.0-only
 Group:          Development/Libraries/C and C++
 URL:            https://wiki.gnome.org/Projects/gvfs
-Source0:        http://download.gnome.org/sources/gvfs/1.36/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gvfs/1.38/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch bgo#795805 boo#1096476 fezhang@suse.com -- Fix failures copying files on smb mounts
+
-Patch1:         gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch
 ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000).
 # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
 Patch1000:      gvfs-nds.patch
 # PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin
 Patch1001:      gvfs-nvvfs.patch
+
 BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  fuse-devel
+BuildRequires:  libgcrypt-devel >= 1.2.2
-BuildRequires:  libarchive-devel
-BuildRequires:  libavahi-glib-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgphoto2-devel
-BuildRequires:  libimobiledevice-devel >= 1.2
-BuildRequires:  libsoup-devel >= 2.34.0
 BuildRequires:  meson
 BuildRequires:  openssh
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  xsltproc
+BuildRequires:  pkgconfig(avahi-client) >= 0.6
+BuildRequires:  pkgconfig(avahi-glib) >= 0.6
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(fuse) >= 2.8.0
 BuildRequires:  pkgconfig(gcr-base-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.51.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.57.2
-BuildRequires:  pkgconfig(gmodule-no-export-2.0)
 BuildRequires:  pkgconfig(goa-1.0) >= 3.17.1
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gudev-1.0) >= 147
+BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libgdata) >= 0.17.3
-BuildRequires:  pkgconfig(libmtp) >= 1.1.5
+BuildRequires:  pkgconfig(libgphoto2) >= 2.4.0
+BuildRequires:  pkgconfig(libimobiledevice-1.0) >= 1.2
+BuildRequires:  pkgconfig(libmtp) >= 1.1.12
 BuildRequires:  pkgconfig(libnfs) >= 1.9.8
 BuildRequires:  pkgconfig(libsecret-unstable)
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42.0
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libusb-1.0) >= 1.0.21
-BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.114
 BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(udisks2) >= 1.97
 Recommends:     %{name}-lang
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
 %{glib2_gio_module_requires}
 %{?systemd_requires}
-%if %{with_cdda}
+%if %{with cdda}
 BuildRequires:  pkgconfig(libcdio_paranoia) >= 0.78.2
 %endif
-%if !%{with_udisks2}
-BuildRequires:  libgdu-devel
-%endif
-%if %{with_udisks2}
-BuildRequires:  pkgconfig(udisks2) >= 1.97
-%endif
 %if !0%{?is_opensuse}
 # The library gvfscommon was converted to a private library and is not used outside of gvfs
 Obsoletes:      libgvfscommon0 <= %{version}
@@ -122,9 +117,7 @@ Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 # FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         permissions
-%if %{with_udisks2}
 Recommends:     udisks2
-%endif
 
 %description backends
 VFS functionality for GLib.
@@ -166,7 +159,6 @@ gvfs plugins.
 %prep
 %setup -q
 translation-update-upstream po %{name}
-%patch1 -p1
 %if !0%{?is_opensuse}
 %patch1000 -p1
 %patch1001 -p1
@@ -175,15 +167,9 @@ translation-update-upstream po %{name}
 %build
 %meson \
     --libexecdir=%{_libexecdir}/%{name} \
-%if %{with_udisks2}
     -Dudisks2=true \
-    -Dgdu=false \
+    %{!?with_cdda: -Dcdda=false} \
-%else
+    -Dman=true
-    -Dudisks2=false \
-    -Dgdu=true \
-%endif
-    -Dman=true \
-    %{nil}
 %meson_build
 
 %install
@@ -191,6 +177,9 @@ translation-update-upstream po %{name}
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}
 
+# Rename daemon/trashlib/COPYING
+mv daemon/trashlib/COPYING daemon/trashlib/COPYING.trashlib
+
 %post
 %{glib2_gio_module_post}
 
@@ -207,8 +196,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{glib2_gio_module_postun}
 
 %files
-%license COPYING
+%license COPYING daemon/trashlib/COPYING.trashlib
-%doc AUTHORS NEWS README
+%doc NEWS README.md
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/mounts
 %dir %{_datadir}/%{name}/remote-volume-monitors
@@ -221,7 +210,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/dbus-1/services/org.gtk.vfs.Daemon.service
 %{_libexecdir}/%{name}/gvfsd-metadata
 %{_datadir}/dbus-1/services/org.gtk.vfs.Metadata.service
-%{_mandir}/man1/gvfs-*.1%{?ext_man}
 %{_mandir}/man1/gvfsd.1%{?ext_man}
 %{_mandir}/man1/gvfsd-metadata.1%{?ext_man}
 %{_mandir}/man7/gvfs.7%{?ext_man}
@@ -253,17 +241,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/GConf/gsettings/gvfs-smb.convert
 
 %files backends
-%if %{with_udisks2}
 %doc monitor/udisks2/what-is-shown.txt
 %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/udisks2.monitor
 %{_libexecdir}/%{name}/gvfs-udisks2-volume-monitor
 %{_userunitdir}/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
 %{_userunitdir}/gvfs-gphoto2-volume-monitor.service
 %{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service
@@ -280,7 +262,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/%{name}/mounts/archive.mount
 %{_libexecdir}/%{name}/gvfsd-burn
 %{_datadir}/%{name}/mounts/burn.mount
-%if %{with_cdda}
+%if %{with cdda}
 %{_libexecdir}/%{name}/gvfsd-cdda
 %{_datadir}/%{name}/mounts/cdda.mount
 %endif
@@ -294,6 +276,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libexecdir}/%{name}/gvfsd-ftp
 %{_datadir}/%{name}/mounts/ftp.mount
 %{_datadir}/%{name}/mounts/ftps.mount
+%{_datadir}/%{name}/mounts/ftpis.mount
 %{_libexecdir}/%{name}/gvfsd-google
 %{_datadir}/%{name}/mounts/google.mount
 %{_libexecdir}/%{name}/gvfsd-gphoto2
@@ -314,7 +297,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/%{name}/mounts/mtp.mount
 %if !0%{?is_opensuse}
 %{_libexecdir}/%{name}/gvfsd-nds
+%{_libexecdir}/%{name}/gvfsd-nvvfs
 %{_datadir}/%{name}/mounts/nds.mount
+%{_datadir}/%{name}/mounts/nvvfs.mount
 %endif
 %{_libexecdir}/%{name}/gvfsd-network
 %{_datadir}/%{name}/mounts/network.mount
@@ -322,10 +307,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %verify(not mode caps) %caps(cap_net_bind_service=+ep) %{_libexecdir}/%{name}/gvfsd-nfs
 %{_libexecdir}/%{name}/gvfsd-nfs
 %{_datadir}/%{name}/mounts/nfs.mount
-%if !0%{?is_opensuse}
-%{_libexecdir}/%{name}/gvfsd-nvvfs
-%{_datadir}/%{name}/mounts/nvvfs.mount
-%endif
 %{_libexecdir}/%{name}/gvfsd-recent
 %{_datadir}/%{name}/mounts/recent.mount
 %{_libexecdir}/%{name}/gvfsd-sftp
@@ -342,7 +323,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
 
 %files devel
-%doc ChangeLog.pre-1-2 MAINTAINERS README.commits
+%doc CONTRIBUTING.md NEWS.pre-1-2
 %{_includedir}/gvfs-client
 
 %files lang -f %{name}.lang