testing/baculum: move locale files to appropriate subpackage

Also fix dependency for -api-lighttpd and use versioned dependencies for
-common.

1 files changed, 10 insertions, 7 deletions

diff --git a/testing/baculum/APKBUILD b/testing/baculum/APKBUILD
index 967ea7d1782..41370299f07 100644
--- a/testing/baculum/APKBUILD
+++ b/testing/baculum/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=baculum
 pkgver=9.6.3
-pkgrel=4
+pkgrel=5
 pkgdesc="API layer to Baculum WebGUI tool for Bacula Community program"
 url="https://bacula.org/"
 arch="noarch"
@@ -96,7 +96,9 @@ _api() {
 	pkgdesc="Baculum API files"
 	depends="$pkgname-common=$pkgver-r$pkgrel $_api_depends"
 	amove \
-		usr/share/baculum/htdocs/protected/API
+		usr/share/baculum/htdocs/protected/API \
+		usr/share/locale/*/LC_MESSAGES/baculum-api.mo
+
 	# will be symlinks
 	rm -r "$subpkgdir"/usr/share/baculum/htdocs/protected/API/Config \
 		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Logs
@@ -107,7 +109,8 @@ _web() {
 	pkgdesc="Baculum Web files"
 	depends="$pkgname-common=$pkgver-r$pkgrel $_web_depends"
 	amove \
-		usr/share/baculum/htdocs/protected/Web
+		usr/share/baculum/htdocs/protected/Web \
+		usr/share/locale/*/LC_MESSAGES/baculum-web.mo
 	# will be symlinks
 	rm -r "$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Config \
 		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Logs
@@ -116,7 +119,7 @@ _web() {
 
 _api_apache2() {
 	pkgdesc="Apache configuration for Baculum API"
-	depends="$pkgname-api $_apache_depends"
+	depends="$pkgname-api=$pkgver-r$pkgrel $_apache_depends"
 	amove etc/baculum/Config-api-apache \
 		etc/apache2/conf.d/baculum-api.conf
 	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/API
@@ -126,7 +129,7 @@ _api_apache2() {
 
 _api_lighttpd() {
 	pkgdesc="Lighttpd configuration for Baculum API"
-	depends="$pkgname-web $_lighttpd_depends"
+	depends="$pkgname-api=$pkgver-r$pkgrel $_lighttpd_depends"
 	amove etc/baculum/Config-api-lighttpd \
 		etc/baculum/baculum-api-lighttpd.conf
 	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/API
@@ -136,7 +139,7 @@ _api_lighttpd() {
 
 _web_apache2() {
 	pkgdesc="Apache configuration for Baculum WebGUI"
-	depends="$pkgname-web $_apache_depends"
+	depends="$pkgname-web=$pkgver-r$pkgrel $_apache_depends"
 	amove etc/baculum/Config-web-apache \
 		etc/apache2/conf.d/baculum-web.conf
 	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/Web
@@ -146,7 +149,7 @@ _web_apache2() {
 
 _web_lighttpd() {
 	pkgdesc="Lighttpd configuration for Baculum WebGUI"
-	depends="$pkgname-web $_lighttpd_depends"
+	depends="$pkgname-web=$pkgver-r$pkgrel $_lighttpd_depends"
 	amove etc/baculum/Config-web-lighttpd \
 		etc/baculum/baculum-web-lighttpd.conf
 	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/Web