From b505fe12ce6b0c520cc4854b1b9633e1228ec895 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sun, 19 Dec 2010 10:46:33 +0000
Subject: testing/obexd: add conflict for obex-data-server

---
 testing/obexd/APKBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'testing/obexd')

diff --git a/testing/obexd/APKBUILD b/testing/obexd/APKBUILD
index 64913477c8..acc2ef5c3a 100644
--- a/testing/obexd/APKBUILD
+++ b/testing/obexd/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obexd
 pkgver=0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus service for Obex Server"
 url="http://www.bluez.org/"
 arch="x86 x86_64"
 license="GPL2"
-depends=
+depends="!obex-data-server"
 subpackages="$pkgname-client"
 makedepends="dbus-glib-dev openobex-dev glib-dev bluez-dev libical-dev"
 source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
@@ -35,6 +35,7 @@ _mv_files() {
 
 client() {
 	pkgdesc="D-Bus service for Obex Client access"
+	depends=
 	cd "$pkgdir"
 	_mv_files usr/lib/obexd/obex-client \
 		usr/share/dbus-*/services/obex-client.service
-- 
cgit v1.2.3