From 820ca1e1df361daf29fdc8fbfe2450961b83f9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 4 Feb 2011 21:28:58 +0200
Subject: main/talloc, samba: fix libtalloc conflict

* make samba use talloc provided libraries
* allow talloc to overwrite libtalloc from samba-common
---
 main/talloc/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main/talloc/APKBUILD')

diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index ce86bb139b..efc4863672 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -2,13 +2,14 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=talloc
 pkgver=2.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="memory pool management library"
 url="http://talloc.samba.org/"
 arch="all"
 license="LGPL"
 depends=
 depends_dev=
+replaces="samba-common"
 makedepends="$depends_dev python"
 install=""
 subpackages="$pkgname-dev"
-- 
cgit v1.2.3