- updated to 1.26.1.1

- added google backend

diff --git a/gvfs.spec b/gvfs.spec
index 726efb82bf59b300908e27f3c8ee1293705b7338..25666d5ab8bd65289efd5d46508b1ac19069f24c 100644 (file)
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -9,6 +9,7 @@
 %bcond_without cdda    # CDDA backend
 %bcond_without fuse    # FUSE support
 %bcond_without goa     # GOA backend
+%bcond_without google  # Google backend
 %bcond_with    gdu     # GDU (Gnome Disk Utility) volume monitor (3.0.2 <= v < 3.4)
 %bcond_without gphoto2 # gphoto2 support
 %bcond_without gtk     # GTK+
@@ -35,27 +36,28 @@
 Summary:       gvfs - userspace virtual filesystem
 Summary(pl.UTF-8):     gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:          gvfs
-Version:       1.24.2
+Version:       1.26.1.1
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.24/%{name}-%{version}.tar.xz
-# Source0-md5: 83ed317eb2a5264715d4273e90a5cfd8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.26/%{name}-%{version}.tar.xz
+# Source0-md5: 9f2e8c85ea3bfc216f8594feed4984cb
 Patch0:                set_attributes_from_info-v1.patch
 URL:           https://live.gnome.org/gvfs
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11.1
 %{?with_avahi:BuildRequires:   avahi-devel >= 0.6.22}
 %{?with_avahi:BuildRequires:   avahi-glib-devel >= 0.6.22}
-%{?with_cdda:BuildRequires:    cdparanoia-III-devel >= 1:10}
 BuildRequires: dbus-devel
 %{?with_doc:BuildRequires:     docbook-dtd42-xml}
 %{?with_doc:BuildRequires:     docbook-style-xsl}
+BuildRequires: gcr-devel >= 3
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.43.2
+BuildRequires: glib2-devel >= 1:2.46.0
 %{?with_gdu:BuildRequires:     gnome-disk-utility-devel < 3.4}
 %{?with_gdu:BuildRequires:     gnome-disk-utility-devel >= 3.0.2}
 %{?with_goa:BuildRequires:     gnome-online-accounts-devel >= 3.8.0}
+%{?with_google:BuildRequires:  gnome-online-accounts-devel >= 3.18.0}
 %{?with_gtk:BuildRequires:     gtk+3-devel >= 3.0}
 BuildRequires: intltool >= 0.40.0
 %{?with_archive:BuildRequires: libarchive-devel >= 3.0.22}
@@ -63,6 +65,7 @@ BuildRequires:        intltool >= 0.40.0
 %{?with_cdda:BuildRequires:    libcdio-paranoia-devel >= 0.78.2}
 %{?with_fuse:BuildRequires:    libfuse-devel >= 2.8.0}
 BuildRequires: libgcrypt-devel >= 1.2.2
+%{?with_google:BuildRequires:  libgdata-devel >= 0.17.3}
 %{?with_gphoto2:BuildRequires: libgphoto2-devel >= 2.5.0}
 %{?with_afc:BuildRequires:     libimobiledevice-devel >= 1.1.5}
 %{?with_mtp:BuildRequires:     libmtp-devel >= 1.1.6}
@@ -82,10 +85,9 @@ BuildRequires:       tar >= 1:1.22
 %{?with_gudev:BuildRequires:   udev-glib-devel >= 1:147}
 %{?with_udisks2:BuildRequires: udisks2-devel >= 1.97.0}
 BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.43.2
+Requires(post,postun): glib2 >= 1:2.46.0
 Requires:      %{name}-libs = %{version}-%{release}
 %{?with_avahi:Requires:        avahi-glib >= 0.6.22}
-%{?with_cdda:Requires: cdparanoia-III-libs >= 1:10}
 %{?with_cdda:Requires: libcdio-paranoia >= 0.78.2}
 %{?with_nfs:Requires:  libnfs >= 1.9.7}
 Requires:      libplist >= 0.15
@@ -99,6 +101,7 @@ Requires:    libxml2 >= 1:2.6.31
 %{?with_archive:Suggests:      %{name}-archive}
 %{?with_fuse:Suggests: %{name}-fuse}
 %{?with_goa:Suggests:  %{name}-goa}
+%{?with_google:Suggests:       %{name}-google}
 %{?with_gphoto2:Suggests:      %{name}-gphoto2}
 %{?with_mtp:Suggests:  %{name}-mtp}
 %{?with_samba:Suggests:        %{name}-smb}
@@ -122,7 +125,7 @@ gfvs-a do wszystkich aplikacji używających API gio.
 Summary:       Common GVFS shared libraries
 Summary(pl.UTF-8):     Wspólne biblioteki współdzielone GVFS
 Group:         Libraries
-Requires:      glib2 >= 1:2.43.2
+Requires:      glib2 >= 1:2.46.0
 Conflicts:     gvfs < 1.22.3-2
 
 %description libs
@@ -136,7 +139,7 @@ Summary:    Header files for gvfs library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gvfs
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.43.2
+Requires:      glib2-devel >= 1:2.46.0
 
 %description devel
 Header files for gvfs library.
@@ -222,6 +225,22 @@ file services.
 Ten pakiet zapewnia przezroczystą integrację z usługami plikowymi
 gnome-online-accounts.
 
+%package google
+Summary:       Google Drive support for gvfs
+Summary(pl.UTF-8):     Obsługa Google Drive dla gvfs
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      gnome-online-accounts-libs >= 3.18.0
+Requires:      libgdata >= 0.17.3
+
+%description google
+This package provides support for Google Drive to applications using
+gvfs.
+
+%description google -l pl.UTF-8
+Ten pakiet zapewnia obsługę Google Drive dla aplikacji
+wykorzystujących gvfs.
+
 %package gphoto2
 Summary:       gphoto2 support for gvfs
 Summary(pl.UTF-8):     Obsługa gphoto2 dla gvfs
@@ -305,6 +324,7 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla gvfs.
        %{__enable_disable fuse} \
        %{__enable_disable gdu} \
        %{__enable_disable goa} \
+       %{__enable_disable google} \
        %{__enable_disable gphoto2} \
        %{__enable_disable gtk} \
        %{__enable_disable gudev} \
@@ -360,6 +380,9 @@ killall -USR1 gvfsd >/dev/null 2>&1 || :
 %post goa
 killall -USR1 gvfsd >/dev/null 2>&1 || :
 
+%post google
+killall -USR1 gvfsd >/dev/null 2>&1 || :
+
 %post gphoto2
 killall -USR1 gvfsd >/dev/null 2>&1 || :
 
@@ -408,19 +431,22 @@ fi
 %attr(755,root,root) %{_libexecdir}/gvfsd-network
 %attr(755,root,root) %{_libexecdir}/gvfsd-sftp
 %attr(755,root,root) %{_libexecdir}/gvfsd-trash
-%{_datadir}/dbus-1/services/gvfs-daemon.service
-%{_datadir}/dbus-1/services/gvfs-metadata.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.Daemon.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.Metadata.service
 %dir %{_datadir}/gvfs
 %dir %{_datadir}/gvfs/mounts
 %dir %{_datadir}/gvfs/remote-volume-monitors
 %{_datadir}/gvfs/mounts/burn.mount
 %{_datadir}/gvfs/mounts/computer.mount
 %{_datadir}/gvfs/mounts/ftp.mount
+%{_datadir}/gvfs/mounts/ftps.mount
 %{_datadir}/gvfs/mounts/localtest.mount
 %{_datadir}/gvfs/mounts/network.mount
 %{_datadir}/gvfs/mounts/sftp.mount
 %{_datadir}/gvfs/mounts/trash.mount
 %{_datadir}/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
+%{systemduserunitdir}/gvfs-daemon.service
+%{systemduserunitdir}/gvfs-metadata.service
 
 # cdda
 %if %{with cdda}
@@ -452,8 +478,9 @@ fi
 # udisks2
 %if %{with udisks2}
 %attr(755,root,root) %{_libexecdir}/gvfs-udisks2-volume-monitor
-%{_datadir}/dbus-1/services/org.gtk.Private.UDisks2VolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/udisks2.monitor
+%{systemduserunitdir}/gvfs-udisks2-volume-monitor.service
 %endif
 
 # avahi
@@ -486,9 +513,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gvfs-afc-volume-monitor
 %attr(755,root,root) %{_libexecdir}/gvfsd-afc
-%{_datadir}/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service
 %{_datadir}/gvfs/mounts/afc.mount
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
+%{systemduserunitdir}/gvfs-afc-volume-monitor.service
 %endif
 
 %if %{with afp}
@@ -524,8 +552,16 @@ fi
 %files goa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gvfs-goa-volume-monitor
-%{_datadir}/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/goa.monitor
+%{systemduserunitdir}/gvfs-goa-volume-monitor.service
+%endif
+
+%if %{with google}
+%files google
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gvfsd-google
+%{_datadir}/gvfs/mounts/google.mount
 %endif
 
 %if %{with gphoto2}
@@ -533,9 +569,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gvfs-gphoto2-volume-monitor
 %attr(755,root,root) %{_libexecdir}/gvfsd-gphoto2
-%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service
 %{_datadir}/gvfs/mounts/gphoto2.mount
 %{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
+%{systemduserunitdir}/gvfs-gphoto2-volume-monitor.service
 %endif
 
 %if %{with mtp}
@@ -543,9 +580,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gvfs-mtp-volume-monitor
 %attr(755,root,root) %{_libexecdir}/gvfsd-mtp
-%{_datadir}/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service
+%{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service
 %{_datadir}/gvfs/mounts/mtp.mount
 %{_datadir}/gvfs/remote-volume-monitors/mtp.monitor
+%{systemduserunitdir}/gvfs-mtp-volume-monitor.service
 %endif
 
 %if %{with samba}