Merge branch 'master' of git://git.pld-linux.org/packages/gvfs

Conflicts:
	gvfs.spec

diff --cc gvfs.spec
index a1921434ee21c73cd516ad49b99f661a8b608b7a,de00ce64573b7d68a853519b1ee8ddaa1d9334dc..e1d1fe770b7bebe8ca46f15ce95efe174d279b67
--- 1/gvfs.spec
--- 2/gvfs.spec
+++ b/gvfs.spec
@@@ -1,26 -1,26 +1,26 @@@
  #
  # Conditional build:
 -%bcond_without        doc     # do not build and package docs
 -%bcond_without        http    # do not build http/dav backend
 -%bcond_without        avahi   # do not build avahi support
 -%bcond_without        udev    # build without libudev
 -%bcond_without        fuse    # build without FUSE support
 -%bcond_with   gdu     # build with GDU (Gnome Disk Utility) volume monitor
 -%bcond_without        udisks2 # build without libudisks2
 -%bcond_without        systemd # build without liblibsystemd-login
 -%bcond_without        gudev   # build without gudev support (use HAL)
 -%bcond_without        cdda    # build without CDDA backend
 -%bcond_without        afc     # build without AFC backend
 -%bcond_without        goa     # build without GOA backend
 -%bcond_without        obexftp # build without ObexFTP backend
 -%bcond_without        gphoto2 # build without gphoto2 support
 -%bcond_with   keyring # build without GNOME Keyring support
 -%bcond_without        bluray  # build without bluray metadata support
 -%bcond_without        mtp     # build without libmtp support
 -%bcond_without        samba   # build without samba support
 -%bcond_without        gtk     # build without GTK+
 -%bcond_without        archive # build without archive support
 -%bcond_without        afp     # build without AFP support
 +%bcond_without        doc     # docs building and packaging
 +%bcond_without        afc     # AFC backend
 +%bcond_without        afp     # AFP support
 +%bcond_without        archive # archive support
 +%bcond_without        avahi   # DNS-SD / Avahi support
 +%bcond_without        bluray  # bluray metadata support
 +%bcond_without        cdda    # CDDA backend
 +%bcond_without        fuse    # FUSE support
 +%bcond_without        goa     # GOA backend
 +%bcond_with   gdu     # GDU (Gnome Disk Utility) volume monitor
 +%bcond_without        gphoto2 # gphoto2 support
 +%bcond_without        gtk     # GTK+
 +%bcond_without        gudev   # gudev support (if disabled, HAL could be used)
 +%bcond_without        http    # HTTP/DAV backend
 +%bcond_with   keyring # GNOME Keyring support
 +%bcond_without        mtp     # MTP support
 +%bcond_without        obexftp # ObexFTP backend
 +%bcond_without        samba   # SMB support
 +%bcond_without        systemd # libsystemd-login support
- %bcond_without        udev    # udev support (needed also for gphoto2 and mtp)
++%bcond_without        udev    # udev support (needed also for gphoto2, mtp, udisks2)
 +%bcond_without        udisks2 # libudisks2 support
  
  %if %{without gudev}
  %undefine     with_gphoto2
@@@ -482,16 -461,31 +483,21 @@@ killall -USR1 gvfsd >/dev/null 2>&1 || 
  %files fuse
  %defattr(644,root,root,755)
  %attr(755,root,root) %{_libexecdir}/gvfsd-fuse
+ %if %{with doc}
  %{_mandir}/man1/gvfsd-fuse.1*
+ %endif
+ %if %{with systemd}
+ # FIXME: reusing USE_LIBSYSTEMD_LOGIN as systemd has no universal header or pkg-config file
  %{systemdtmpfilesdir}/gvfsd-fuse-tmpfiles.conf
  %endif
+ %endif
  
 -%if %{with samba}
 -%files smb
 -%defattr(644,root,root,755)
 -%attr(755,root,root) %{_libexecdir}/gvfsd-smb
 -%attr(755,root,root) %{_libexecdir}/gvfsd-smb-browse
 -%{_datadir}/gvfs/mounts/smb-browse.mount
 -%{_datadir}/gvfs/mounts/smb.mount
 -%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 -%{_datadir}/GConf/gsettings/gvfs-smb.convert
 -%endif
 -
 -%if %{with archive}
 -%files archive
 +%if %{with goa}
 +%files goa
  %defattr(644,root,root,755)
 -%attr(755,root,root) %{_libexecdir}/gvfsd-archive
 -%{_datadir}/gvfs/mounts/archive.mount
 +%attr(755,root,root) %{_libexecdir}/gvfs-goa-volume-monitor
 +%{_datadir}/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service
 +%{_datadir}/gvfs/remote-volume-monitors/goa.monitor
  %endif
  
  %if %{with gphoto2}