summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Heinrich2017-01-23 18:54:40 +0100
committerJonas Heinrich2017-01-23 18:54:40 +0100
commitbbf6e413b3f5049b586d89fb80075954393acca1 (patch)
treecb8695dd4fb1775da91244ccb2dd07ab1803406a
parent590110c3940d8107b6384f17228139a7c2df55ef (diff)
downloadaur-bbf6e413b3f5049b586d89fb80075954393acca1.tar.gz
fixed post install instructions and compile flags
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD9
-rw-r--r--libreoffice-online.install3
3 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 597c86c4eb8c..bfb9c1c8b1ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Jan 23 15:37:30 UTC 2017
+# Mon Jan 23 17:54:26 UTC 2017
pkgbase = libreoffice-online
pkgdesc = HTML5-based/cloud-based version of the office suite
pkgver = 2.0.2
- pkgrel = 3
+ pkgrel = 4
url = https://cgit.freedesktop.org/libreoffice/online/
install = libreoffice-online.install
arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = libreoffice-online
depends = libpng12
depends = poco
depends = pcre
+ depends = cpio
source = git+https://github.com/LibreOffice/core.git
source = libreoffice-online-2.0.2-3.tar.gz::https://github.com/LibreOffice/online/archive/2.0.2-3.tar.gz
source = loolwsd.service
diff --git a/PKGBUILD b/PKGBUILD
index cb4380961c6d..4371095828ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=libreoffice-online
pkgver=2.0.2
-pkgrel=3
+pkgrel=4
pkgdesc="HTML5-based/cloud-based version of the office suite"
arch=("x86_64")
url="https://cgit.freedesktop.org/libreoffice/online/"
license=("MPL")
makedepends=("cppunit" "poco" "libreoffice")
-depends=("libpng12" "poco" "pcre")
+depends=("libpng12" "poco" "pcre" "cpio")
install="libreoffice-online.install"
source=("git+https://github.com/LibreOffice/core.git"
@@ -25,7 +25,8 @@ build() {
./configure --enable-silent-rules \
--with-lokit-path=${srcdir}/core/include \
--with-lo-path=/usr/lib/libreoffice \
- --prefix=/
+ --prefix=/usr \
+ --sysconfdir=/etc
#./configure --enable-silent-rules --with-lokit-path=/usr/include/libreoffice --with-lo-path=/usr/lib/libreoffice
BUILDING_FROM_RPMBUILD=yes make
}
@@ -34,7 +35,7 @@ package() {
cd "${srcdir}/online-${pkgver}-3"
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/
+ #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"
diff --git a/libreoffice-online.install b/libreoffice-online.install
index b44946fef09d..e8bce737c4ad 100644
--- a/libreoffice-online.install
+++ b/libreoffice-online.install
@@ -1,7 +1,7 @@
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
}
post_update() {
@@ -17,5 +17,6 @@ post_update() {
post_remove() {
userdel -rf lool
groupdel lool
+ rm -r /var/lib/lool
}