From 367baf47c1effeb4fc05dd231d4b427da9f3f14d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 11 May 2015 12:01:42 +0000
Subject: testing/postgresql-bdr: remove client and client lib

we remove the client and libpq to avoid conflict with mainline
postgresql.
---
 testing/postgresql-bdr/APKBUILD | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'testing/postgresql-bdr')

diff --git a/testing/postgresql-bdr/APKBUILD b/testing/postgresql-bdr/APKBUILD
index 244c30afc2..814963db9f 100644
--- a/testing/postgresql-bdr/APKBUILD
+++ b/testing/postgresql-bdr/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=postgresql-bdr
 pkgver=9.4.1_p2
 _ver=${pkgver/_p/_bdr}
-pkgrel=3
+pkgrel=4
 pkgdesc="A sophisticated object-relational DBMS with bidirectional replication support (BDR)"
 url="https://wiki.postgresql.org/wiki/BDR_Administration"
 arch="all"
@@ -11,8 +11,7 @@ depends="bash postgresql-client"
 install="$pkgname.pre-upgrade"
 depends_dev="readline-dev openssl-dev zlib-dev libxml2-dev"
 makedepends="$depends_dev perl bison flex-dev"
-subpackages="$pkgname-dev $pkgname-dbg $pkgname-libpq $pkgname-client
-	$pkgname-contrib"
+subpackages="$pkgname-dev $pkgname-contrib"
 provides="postgresql"
 patches="initdb.patch
 	postgresql-bdr-osxflags.patch
@@ -75,21 +74,10 @@ package() {
 		"$pkgdir"/etc/init.d/pgbdr-restore || return 1
 	install -D -m644 "$srcdir"/pgbdr-restore.confd \
 		"$pkgdir"/etc/conf.d/pgbdr-restore || return 1
-}
 
-libpq() {
-	depends=
-	pkgdesc="PostgreSQL libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib/
-}
+	# purge libpq to avoid conflict with mainline postgresql
+	rm "$pkgdir"/usr/lib/libpq.so* "$pkgdir"/usr/bin/psql || return 1
 
-client() {
-	depends=
-	replaces="postgresql-client"
-	pkgdesc="PostgreSQL client"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/psql "$subpkgdir"/usr/bin/
 }
 
 contrib() {
-- 
cgit v1.2.3