[packages/gvfs] handle multiple bcond conditions

[glen]

commit 1e7f5020a38c6e25754dedbfda4bbb8b5077b012
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 16 03:36:42 2014 +0200

    handle multiple bcond conditions

 gvfs.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gvfs.spec b/gvfs.spec
index 284c0e0..de00ce6 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -25,6 +25,7 @@
 %if %{without gudev}
 %undefine	with_gphoto2
 %undefine	with_mtp
+%undefine	with_udisks2
 %endif
 
 %ifarch s390 s390x
@@ -420,7 +421,7 @@ killall -USR1 gvfsd >/dev/null 2>&1 || :
 %{?with_cdda:%{_datadir}/gvfs/mounts/cdda.mount}
 %{_datadir}/gvfs/mounts/computer.mount
 %{?with_http:%{_datadir}/gvfs/mounts/dav.mount}
-%{?with_http:%{_datadir}/gvfs/mounts/dav+sd.mount}
+%{?with_http:%{?with_avahi:%{_datadir}/gvfs/mounts/dav+sd.mount}}
 %{?with_avahi:%{_datadir}/gvfs/mounts/dns-sd.mount}
 %{_datadir}/gvfs/mounts/ftp.mount
 %{?with_http:%{_datadir}/gvfs/mounts/http.mount}
@@ -463,8 +464,11 @@ killall -USR1 gvfsd >/dev/null 2>&1 || :
 %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gvfs.git/commitdiff/1e7f5020a38c6e25754dedbfda4bbb8b5077b012