From eca252ed55b2d0ec00a9587f67488635f2e40ba2 Mon Sep 17 00:00:00 2001
From: cr6git <quark6@protonmail.com>
Date: Sat, 9 Dec 2017 12:36:41 +0100
Subject: [PATCH] obexftp: avoid conflict with obexfs

---
 srcpkgs/obexftp/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/obexftp/template b/srcpkgs/obexftp/template
index f1e725be80f..30ea20083b7 100644
--- a/srcpkgs/obexftp/template
+++ b/srcpkgs/obexftp/template
@@ -1,7 +1,7 @@
 # Template file for 'obexftp'
 pkgname=obexftp
 version=0.24.2
-revision=1
+revision=2
 wrksrc=${pkgname}-${version}-Source
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -18,16 +18,19 @@ nocross="crctable needs to be built for the host"
 post_install() {
 	# Do not require 'bluetooth', does not exist.
 	sed -i '/Requires:/s/bluetooth//' ${DESTDIR}/usr/lib/pkgconfig/obexftp.pc
+
+	# The 'obexfs' package already provides these files
+	rm -fv ${DESTDIR}/usr/bin/{obexautofs,obexfs}
 }
 
 libbfb_package() {
-	short_desc="bfb protocol library"
+	short_desc="BFB protocol library"
 	pkg_install() {
 		vmove "usr/lib/libbfb.so.*"
 	}
 }
 libbfb-devel_package() {
-	short_desc="bfb protocol library - development files"
+	short_desc="BFB protocol library - development files"
 	depends="libbfb-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/bfb