Date: Tuesday, April 25, 2017 @ 14:31:05 Author: spupykin Revision: 225304
archrelease: copy trunk to community-x86_64 Added: libreoffice-online/repos/community-x86_64/PKGBUILD (from rev 225303, libreoffice-online/trunk/PKGBUILD) libreoffice-online/repos/community-x86_64/libreoffice-online.install (from rev 225303, libreoffice-online/trunk/libreoffice-online.install) libreoffice-online/repos/community-x86_64/loolwsd.service (from rev 225303, libreoffice-online/trunk/loolwsd.service) Deleted: libreoffice-online/repos/community-x86_64/PKGBUILD libreoffice-online/repos/community-x86_64/libreoffice-online.install libreoffice-online/repos/community-x86_64/loolwsd.service ----------------------------+ PKGBUILD | 110 +++++++++++++++++++++---------------------- libreoffice-online.install | 44 ++++++++--------- loolwsd.service | 24 ++++----- 3 files changed, 89 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-04-25 14:30:49 UTC (rev 225303) +++ PKGBUILD 2017-04-25 14:31:05 UTC (rev 225304) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> -# Maintainer: Jonas Heinrich <o...@project-insanity.org> -# Contributor: Jonas Heinrich <o...@project-insanity.org> - -pkgname=libreoffice-online -pkgver=2.0.6 -pkgrel=1 -pkgdesc="HTML5-based/cloud-based version of the office suite" -arch=('x86_64' 'i686') -url="https://cgit.freedesktop.org/libreoffice/online/" -license=("MPL") -makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath") -depends=("libpng12" "poco" "pcre" "cpio" "libreoffice") -backup=("etc/loolwsd/loolwsd.xml") -install="libreoffice-online.install" - -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz" - "loolwsd.service") -sha512sums=('bee13c735e4d564a349465079042764ceea0539ffe065fbb8739f9e9bacd25b40b3ecf5ffd3c336b7fe9a26d391f02c04e3116f6d80eed37d12d7933ae458071' - '71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6') - -prepare() { - cd "${srcdir}/online-${pkgver}" - sed -i '1,1i#include <sys/sysmacros.h>' kit/Kit.cpp -# sed -i 's|120UL|120U|g' common/Protocol.hpp -# sed -i 's|-Werror||g' configure.ac -} - -build() { - cd "${srcdir}/online-${pkgver}" - ./autogen.sh - ./configure --enable-silent-rules \ - --with-lokit-path=/usr/include/libreoffice \ - --with-lo-path=/usr/lib/libreoffice \ - --prefix=/usr \ - --sysconfdir=/etc - BUILDING_FROM_RPMBUILD=yes make - cd loleaflet - make -} - -package() { - cd "${srcdir}/online-${pkgver}" - BUILDING_FROM_RPMBUILD=yes make DESTDIR=${pkgdir} install - install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service" - mkdir -p "${pkgdir}/var/lib/lool" - mkdir -p "${pkgdir}/var/cache/loolwsd" - mkdir -p "${pkgdir}/var/lib/lool/child-roots" - chmod u+w "${pkgdir}/var/lib/lool/child-roots" - sed -i 's|/usr/var/cache/loolwsd|/var/cache/loolwsd|g' ${pkgdir}/etc/loolwsd/loolwsd.xml - mkdir -p "${pkgdir}/usr/share/loolwsd/loleaflet" - cp -r "loleaflet/dist" "${pkgdir}/usr/share/loolwsd/loleaflet/" - chrpath -d "$pkgdir/usr/bin/"{loolmount,loolforkit} -} Copied: libreoffice-online/repos/community-x86_64/PKGBUILD (from rev 225303, libreoffice-online/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-04-25 14:31:05 UTC (rev 225304) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> +# Maintainer: Jonas Heinrich <o...@project-insanity.org> +# Contributor: Jonas Heinrich <o...@project-insanity.org> + +pkgname=libreoffice-online +pkgver=2.0.6 +pkgrel=2 +pkgdesc="HTML5-based/cloud-based version of the office suite" +arch=('x86_64' 'i686') +url="https://cgit.freedesktop.org/libreoffice/online/" +license=("MPL") +makedepends=("cppunit" "poco" "libreoffice-fresh-sdk" "jake" "npm" "chrpath") +depends=("libpng12" "poco" "pcre" "cpio" "libreoffice") +backup=("etc/loolwsd/loolwsd.xml") +install="libreoffice-online.install" + +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/${pkgver}.tar.gz" + "loolwsd.service") +sha512sums=('bee13c735e4d564a349465079042764ceea0539ffe065fbb8739f9e9bacd25b40b3ecf5ffd3c336b7fe9a26d391f02c04e3116f6d80eed37d12d7933ae458071' + '71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6') + +prepare() { + cd "${srcdir}/online-${pkgver}" + sed -i '1,1i#include <sys/sysmacros.h>' kit/Kit.cpp +# sed -i 's|120UL|120U|g' common/Protocol.hpp +# sed -i 's|-Werror||g' configure.ac +} + +build() { + cd "${srcdir}/online-${pkgver}" + ./autogen.sh + ./configure --enable-silent-rules \ + --with-lokit-path=/usr/include/libreoffice \ + --with-lo-path=/usr/lib/libreoffice \ + --prefix=/usr \ + --sysconfdir=/etc + BUILDING_FROM_RPMBUILD=yes make + cd loleaflet + make +} + +package() { + cd "${srcdir}/online-${pkgver}" + BUILDING_FROM_RPMBUILD=yes make DESTDIR=${pkgdir} install + install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service" + mkdir -p "${pkgdir}/var/lib/lool" + mkdir -p "${pkgdir}/var/cache/loolwsd" + mkdir -p "${pkgdir}/var/lib/lool/child-roots" + chmod u+w "${pkgdir}/var/lib/lool/child-roots" + sed -i 's|/usr/var/cache/loolwsd|/var/cache/loolwsd|g' ${pkgdir}/etc/loolwsd/loolwsd.xml + mkdir -p "${pkgdir}/usr/share/loolwsd/loleaflet" + cp -r "loleaflet/dist" "${pkgdir}/usr/share/loolwsd/loleaflet/" + chrpath -d "$pkgdir/usr/bin/"{loolmount,loolforkit} +} Deleted: libreoffice-online.install =================================================================== --- libreoffice-online.install 2017-04-25 14:30:49 UTC (rev 225303) +++ libreoffice-online.install 2017-04-25 14:31:05 UTC (rev 225304) @@ -1,22 +0,0 @@ -post_install() { - getent group lool > /dev/null || groupadd -r lool > /dev/null - getent passwd lool > /dev/null || useradd -g lool lool > /dev/null - post_upgrade -} - -post_upgrade() { - loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice - chown -R lool:lool /var/cache/loolwsd \ - /var/lib/lool/child-roots \ - /var/lib/lool/systemplate - chmod u+w /var/lib/lool/child-roots - setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit - setcap cap_sys_admin=ep /usr/bin/loolmount -} - -post_remove() { - userdel -rf lool - groupdel lool - rm -r /var/lib/lool -} - Copied: libreoffice-online/repos/community-x86_64/libreoffice-online.install (from rev 225303, libreoffice-online/trunk/libreoffice-online.install) =================================================================== --- libreoffice-online.install (rev 0) +++ libreoffice-online.install 2017-04-25 14:31:05 UTC (rev 225304) @@ -0,0 +1,22 @@ +post_install() { + getent group lool > /dev/null || groupadd -r lool > /dev/null + getent passwd lool > /dev/null || useradd -g lool lool > /dev/null + post_upgrade +} + +post_upgrade() { + loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice + chown -R lool:lool /var/cache/loolwsd \ + /var/lib/lool/child-roots \ + /var/lib/lool/systemplate + chmod u+w /var/lib/lool/child-roots + setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit + setcap cap_sys_admin=ep /usr/bin/loolmount +} + +post_remove() { + userdel -rf lool + groupdel lool + rm -r /var/lib/lool +} + Deleted: loolwsd.service =================================================================== --- loolwsd.service 2017-04-25 14:30:49 UTC (rev 225303) +++ loolwsd.service 2017-04-25 14:31:05 UTC (rev 225304) @@ -1,12 +0,0 @@ -[Unit] -Description=loolwsd as a service - -[Service] -User=lool -ExecStart=/usr/bin/loolwsd --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=on-failure - -[Install] -WantedBy=multi-user.target Copied: libreoffice-online/repos/community-x86_64/loolwsd.service (from rev 225303, libreoffice-online/trunk/loolwsd.service) =================================================================== --- loolwsd.service (rev 0) +++ loolwsd.service 2017-04-25 14:31:05 UTC (rev 225304) @@ -0,0 +1,12 @@ +[Unit] +Description=loolwsd as a service + +[Service] +User=lool +ExecStart=/usr/bin/loolwsd --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=on-failure + +[Install] +WantedBy=multi-user.target