fixed build process, further post install instructions

2 files changed, 12 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7c51ab50d727..e5564086abeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libreoffice-online
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=("x86_64")
 url="https://cgit.freedesktop.org/libreoffice/online/"
@@ -27,15 +27,16 @@ build() {
 	--with-lo-path=/usr/lib/libreoffice \
 	--prefix=/
   #./configure --enable-silent-rules --with-lokit-path=/usr/include/libreoffice --with-lo-path=/usr/lib/libreoffice
-  make
+  BUILDING_FROM_RPMBUILD=yes make
 }
 
 package() {
   cd "${srcdir}/online-${pkgver}-3"
-  make DESTDIR=${pkgdir} install
+  BUILDING_FROM_RPMBUILD=yes make DESTDIR=${pkgdir} install
   install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service"
   mv ${pkgdir}/bin ${pkgdir}/share ${pkgdir}/usr/
   mkdir -p "${pkgdir}/var/lib/lool"
   mkdir -p "${pkgdir}/var/cache/loolwsd"
   mkdir -p "${pkgdir}/var/lib/lool/child-roots"
+  cp -r systemplate "${pkgdir}/var/lib/lool"
 }
diff --git a/libreoffice-online.install b/libreoffice-online.install
index 20b7601049ee..eb6ce93f08ef 100644
--- a/libreoffice-online.install
+++ b/libreoffice-online.install
@@ -1,8 +1,15 @@
 post_install() {
   getent group lool > /dev/null || groupadd -r lool > /dev/null
   getent passwd lool > /dev/null || useradd -g lool lool > /dev/null
+  post_update()
+}
+
+post_update() {
   chown -R lool:lool /var/cache/loolwsd \
-                     /var/lib/lool/child-roots
+                     /var/lib/lool/child-roots \
+                     /var/lib/lool/systemplate
+  setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+  setcap cap_sys_admin=ep /usr/bin/loolmount
 }
 
 post_remove() {