add conflicts=obexfs

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d8f3f5e1b4c..829c1fdefa88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = obexftp
 	pkgdesc = A tool for transfer files to/from any OBEX enabled device
 	pkgver = 0.24.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 	arch = x86_64
 	license = GPL
@@ -17,6 +17,7 @@ pkgbase = obexftp
 	optdepends = ruby: ruby bindings
 	optdepends = tk: TCL/Tk bindings
 	provides = obexfs
+	conflicts = obexfs
 	replaces = obexfs
 	options = !makeflags
 	options = !docs
diff --git a/PKGBUILD b/PKGBUILD
index 856b6dda2354..f9d158bbaf7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@
 
 pkgname=obexftp
 pkgver=0.24.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
 arch=('x86_64')
 url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
 license=('GPL')
 provides=('obexfs')
 replaces=('obexfs')
+conflicts=('obexfs')
 depends=('openobex' 'expat' 'fuse2')
 makedepends=('cmake' 'asciidoc' 'xmlto' 'swig' 'ruby' 'tk')
 optdepends=('ruby: ruby bindings'