summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Klinkovsk√Ĺ2020-01-17 13:26:32 +0100
committerFelix Neumärker2020-01-17 13:30:00 +0100
commitd3fce82e1fc5ddb2ff8a6e2fa48050b4ca8cff4a (patch)
tree8f41892cd7f25f5346a813d1ca5d95f69fec2989
parent7b9e0978c11efafded80fd79aad4e2b251d3d23d (diff)
downloadaur-d3fce82e1fc5.tar.gz
Fix mistakes.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--libreoffice-online.install5
-rw-r--r--loolwsd-config.patch1
4 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbc4683d449..c662df10e82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libreoffice-online
pkgdesc = HTML5-based/cloud-based version of the office suite
pkgver = 6.2.3.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.libreoffice.org/download/libreoffice-online/
install = libreoffice-online.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 5736a6d6200..3110009049c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
pkgname=libreoffice-online
pkgver=6.2.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="HTML5-based/cloud-based version of the office suite"
arch=('x86_64')
url="https://www.libreoffice.org/download/libreoffice-online/"
license=("MPL")
-makedepends=("poco" "libreoffice-fresh-sdk>=6.2" "nodejs" "python-polib" "cppunit" "npm")
+makedepends=("cppunit" "git" "libreoffice-fresh-sdk>=6.2" "nodejs" "npm" "poco" "python-polib")
depends=("poco" "libreoffice" "cpio")
backup=("etc/libreoffice-online/loolwsd.xml")
source=("${pkgname}::git+https://git.libreoffice.org/online#tag=libreoffice-${pkgver}"
@@ -66,7 +66,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}"
make DESTDIR=${pkgdir} install
- mkdir -p "${pkgdir}/var/log" "${pkgdir}/var/lib/{,cache}/libreoffice-online"
+ mkdir -p "${pkgdir}/var/log" "${pkgdir}"/var/lib/{,cache}/libreoffice-online
install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service"
install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
diff --git a/libreoffice-online.install b/libreoffice-online.install
index c507db6a77b..767f6daac94 100644
--- a/libreoffice-online.install
+++ b/libreoffice-online.install
@@ -1,6 +1,9 @@
-post_upgrade() {
+post_install() {
loolconfig update-system-template
setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
}
+post_upgrade() {
+ post_install
+}
diff --git a/loolwsd-config.patch b/loolwsd-config.patch
index c5513a76a46..90ecfc018cd 100644
--- a/loolwsd-config.patch
+++ b/loolwsd-config.patch
@@ -64,4 +64,3 @@ index 2c257c60..68370cf4 100644
std::cout << "Running the following command:" << std::endl
<< command << std::endl;
-