[packages/owncloudclient] - req + commented conflicts

[blues]

commit 63be3806d4c707730b78944b04732d72d97f6c7d
Author: Paweł Gołaszewski <blues at pld-linux.org>
Date:   Tue Apr 12 13:15:23 2016 +0200

    - req + commented conflicts

 owncloudclient.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 1a74451..3344306 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -2,7 +2,7 @@
 Summary:	The ownCloud client
 Name:		owncloudclient
 Version:	2.1.1
-Release:	0.3
+Release:	0.4
 License:	GPL-2.0+
 Group:		X11/Applications
 URL:		https://www.owncloud.com
@@ -19,6 +19,8 @@ BuildRequires:	python-Sphinx
 BuildRequires:	sphinx-pdg
 BuildRequires:	texlive-latex-ams
 BuildRequires:	QtKeychain-devel
+Requires:	mirall-libs
+Requires:	Qt5Gui-platform-xcb
 Suggests:	%{name}-nautilus
 Suggests:	%{name}-nemo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -100,7 +102,8 @@ fi
 %{_desktopdir}/owncloud.desktop
 %{_iconsdir}/*/*/apps/*.png
 %{_datadir}/owncloud
-%{_libdir}/libowncloudsync.so.*
+# conflicts mirall-libs:
+#%{_libdir}/libowncloudsync.so.*
 %{_libdir}/owncloud/libocsync.so.*
 %dir %{_libdir}/owncloud
 %{_datadir}/nautilus-python/extensions/syncstate.py*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/2b137c433a07e47d2650efe00794f96c5bfab348