Fix building due to bad paths, add optdepends and move php-fpm there.

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3b74c6fa237..fae45af103b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = bookstack
 	pkgdesc = A simple, self-hosted, easy-to-use platform for organising and storing information
 	pkgver = 23.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/BookStackApp/BookStack
 	arch = any
 	license = MIT
 	makedepends = composer
 	depends = php
 	depends = php-gd
-	depends = php-fpm
+	optdepends = php-apache: webserver and a PHP implementation
+	optdepends = php-fpm: fastCGI
+	optdepends = mariadb: database
+	optdepends = nginx: webserver
 	options = !strip
 	backup = etc/webapps/bookstack/config.env
 	source = bookstack-23.12.tar.gz::https://github.com/BookStackApp/BookStack/archive/v23.12.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f0c6514e4213..33233a7a3d8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,29 @@
 pkgname=bookstack
 _camelname=BookStack
 pkgver=23.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, self-hosted, easy-to-use platform for organising and storing information'
 arch=('any')
 url="https://github.com/BookStackApp/BookStack"
 license=('MIT')
+# https://www.bookstackapp.com/docs/admin/installation/
 depends=(
 	'php'
 	'php-gd'
-	'php-fpm'
+)
+optdepends=(
+	'php-apache: webserver and a PHP implementation'
+	'php-fpm: fastCGI'
+	'mariadb: database'
+	'nginx: webserver'
 )
 makedepends=('composer')
 source=(
 	"$pkgname-$pkgver.tar.gz::https://github.com/BookStackApp/BookStack/archive/v${pkgver}.tar.gz"
 	'bookstack.conf'
 )
-sha256sums=(
-	'fce344f1c9257465826715861ea0e3d5b8648ad39edde7a24ecf3060cf86e0fe'
-	'82152fc91366d1bd623c559c03240f070e08d45a084a4c6e2e211f671bee8c78'
-)
+sha256sums=('fce344f1c9257465826715861ea0e3d5b8648ad39edde7a24ecf3060cf86e0fe'
+            '82152fc91366d1bd623c559c03240f070e08d45a084a4c6e2e211f671bee8c78')
 options=('!strip')
 backup=("etc/webapps/$pkgname/config.env")
 
@@ -45,5 +49,5 @@ package() {
 	mv "$pkgdir/usr/share/webapps/$pkgname/storage" "$pkgdir/var/lib/$pkgname"
 	ln -s "/var/lib/$pkgname" "$pkgdir/usr/share/webapps/$pkgname/storage"
 
-	install -Dm644 "${srcdir}/../bookstack.conf" "${pkgdir}/usr/lib/tmpfiles.d/bookstack.conf"
+	install -Dm644 "${srcdir}/bookstack.conf" "${pkgdir}/usr/lib/tmpfiles.d/bookstack.conf"
 }