Added php-fpm dependency

2 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16e58a7051cf..2b66648204d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = shaarli-git
 	pkgdesc = The personal, minimalist, super-fast, database free, bookmarking service - community repo
-	pkgver = r2229.aeda845b
+	pkgver = r2316.6d4e3978
 	pkgrel = 1
 	url = https://shaarli.readthedocs.io/en/master/
 	arch = any
@@ -8,7 +8,7 @@ pkgbase = shaarli-git
 	makedepends = composer
 	makedepends = yarn
 	makedepends = mkdocs
-	depends = php>=7.1
+	depends = php-fpm>=7.1
 	provides = shaarli
 	conflicts = shaarli
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 41bd1a603cc1..b225c2d6aa88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Kevin Gillieron <kevin.gillieron@gw-computing.net>
 
 pkgname="shaarli-git"
-pkgver=r2229.aeda845b
+pkgver=r2316.6d4e3978
 pkgrel=1
 _commit="aeda845b3cafc560b976fec7eeebd039a7b779a2"
 pkgdesc="The personal, minimalist, super-fast, database free, bookmarking service - community repo"
@@ -13,7 +13,7 @@ license=("ZLIB")
 arch=("any")
 provides=("shaarli")
 conflicts=("shaarli")
-depends=("php>=7.1")
+depends=("php-fpm>=7.1")
 makedepends=("composer" "yarn" "mkdocs")
 source=("shaarli::git+https://github.com/shaarli/Shaarli.git")
 sha256sums=('SKIP')
@@ -38,20 +38,17 @@ build(){
  find "doc/html/" -type f -exec chmod a-x '{}' \;
 }
 
-package() {
+package(){
  cd "shaarli"
- install -d "$pkgdir/usr/share/webapps/shaarli"
- install -d "$pkgdir/var/lib/shaarli"
-
+ # webapp data
+ install -d -m 750 "$pkgdir/var/lib/shaarli"
  mv "cache" "data" "pagecache" "tmp" "$pkgdir/var/lib/shaarli"
  ln -s "/var/lib/shaarli/"{cache,data,pagecache,tmp} .
  install -D -m 644 "COPYING" "$pkgdir/usr/share/licenses/shaarli/COPYING"
-
+ chown -R http:http "$pkgdir/var/lib/shaarli"
+ # webapp files
+ install -d "$pkgdir/usr/share/webapps/shaarli"
  mv * "$pkgdir/usr/share/webapps/shaarli"
-
  chown -R root:http "$pkgdir/usr/share/webapps/shaarli"
  find "$pkgdir/usr/share/webapps/shaarli/plugins" -type d -exec chmod 775 {} \;
- chown -R http:http "$pkgdir/var/lib/shaarli"
- chmod 750 "$pkgdir/var/lib/shaarli"
-
 }