testing/bareos: removed package split. Bareos for now is not able to track soname dependencies

1 files changed, 19 insertions, 42 deletions

diff --git a/testing/bareos/APKBUILD b/testing/bareos/APKBUILD
index e82f6b7d26..6f165ad93c 100644
--- a/testing/bareos/APKBUILD
+++ b/testing/bareos/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=bareos
 pkgver=15.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
 url="http://www.bareos.org"
 arch="all"
@@ -13,10 +13,10 @@ makedepends="$depends_dev libtool libintl libpcap-dev lzo-dev \
 	sqlite-dev postgresql-dev openssl-dev mariadb-dev acl-dev \
 	qt-dev python-dev readline-dev ncurses-dev"
 install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-trayicon"
 pkgusers="bareos"
 pkggroups="bareos"
-source="$pkgname-$pkgver.tar.gz::https://github.com/bareos/bareos/archive/Release/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/Release/$pkgver.tar.gz
     bareos-dir-init
     bareos-dir-conf
     bareos-sd-init
@@ -45,22 +45,25 @@ build() {
 		--with-subsys-dir=/var/lock \
 		--enable-smartalloc \
 		--enable-largefile \
-		--enable-conio \
 		--enable-readline \
+		--enable-traymonitor \
 		--enable-batch-insert \
 		--enable-acl \
 		--enable-xattr \
 		--enable-scsi-crypto \
 		--enable-lmdb \
 		--enable-ipv6 \
+		--enable-dynamic-cats-backends \
+		--enable-dynamic-debian-package-list \
+		--enable-includes \
+		--disable-conio \
 		--disable-nls \
+		--disable-rpath \
 		--with-postgresql \
 		--with-mysql \
 		--with-sqlite3 \
 		--with-openssl \
 		--with-python \
-		--enable-includes \
-		--disable-rpath \
 		--without-systemd \
 		--with-dir-user=$pkgusers \
 		--with-dir-group=$pkggroups \
@@ -68,7 +71,6 @@ build() {
 		--with-sd-group=$pkggroups \
 		--with-fd-user=root \
 		--with-fd-group=root
-
 	make || return 1
 }
 
@@ -95,48 +97,23 @@ package() {
 	done
 }
 
-_mv_backend() {
-	mkdir -p "$subpkgdir"/usr/lib
-	
-	for dirs in updates grants creates drops; do
-		mkdir -p "$subpkgdir"/etc/bareos/scripts/ddl/$dirs
-		mv "$pkgdir"/etc/bareos/scripts/ddl/$dirs/${1}* \
-			"$subpkgdir"/etc/bareos/scripts/ddl/$dirs
-	done
-
-	mv "$pkgdir"/usr/lib/libbareoscats-${1}-${pkgver}.so \
-	  "$subpkgdir"/usr/lib || return 1
-	mv "$pkgdir"/usr/lib/libbareoscats-${1}.so \
-	  "$subpkgdir"/usr/lib || return 1
-}
-
 dev() {
 	pkgdesc="Bareos header files"
-	mkdir -p "$subpkgdir"/usr/include
-	mv "$pkgdir"/usr/include/$pkgname "$subpkgdir"/usr/include
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/include "$subpkgdir"/usr
 }
 
-mysql() {
-	pkgdesc="Bareos MySQL backend"
+trayicon() {
+	pkgdesc="Bareos trayicon"
 	depends="bareos"
-	_mv_backend mysql
-}
-
-pgsql() {
-	pkgdesc="Bareos PGSQL backend"
-	depends="bareos"
-	pkgusers="postgres"
-	_mv_backend postgresql
-}
-
-sqlite() {
-	pkgdesc="Bareos SQLite backend"
-	depends="bareos"
-	_mv_backend sqlite3
+	mkdir -p "$subpkgdir"/usr/share
+	mkdir -p "$subpkgdir"/usr/bin
+	for dirs in applications pixmaps; do
+		mv "$pkgdir"/usr/share/$dirs "$subpkgdir"/usr/share
+	done
+	mv "$pkgdir"/usr/bin/bareos-tray-monitor "$subpkgdir"/usr/bin
 }
 
-
-
 md5sums="328eebb89d64c11d4594837341b809ac  bareos-15.2.4.tar.gz
 3967099975a3eafe5811482b231b159f  bareos-dir-init
 20f28a16f34e3f20ed18ed81b010e765  bareos-dir-conf