[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian loolwsd/LOOLWSD.cpp loolwsd/loolwsd.service loolwsd/loolwsd.spec.in loolwsd/loolwsd.xml.in
Andras Timar
andras.timar at collabora.com
Mon Jul 18 15:05:39 UTC 2016
loolwsd/LOOLWSD.cpp | 2 +-
loolwsd/debian/loolwsd.postinst | 4 ++--
loolwsd/debian/loolwsd.service | 2 +-
loolwsd/loolwsd.service | 2 +-
loolwsd/loolwsd.spec.in | 6 +++---
loolwsd/loolwsd.xml.in | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 59340c127fb335cee308b851dd8db77458e2788c
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Jul 18 17:04:25 2016 +0200
new default: Collabora Office 5.1
(cherry picked from commit 5f77a1f611cd45bb26d5b05eb634634ec5ef9511)
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 4aab9ba..e5d41cc 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1247,7 +1247,7 @@ void LOOLWSD::initialize(Application& self)
static const std::map<std::string, std::string> DefAppConfig = {
{ "tile_cache_path", LOOLWSD_CACHEDIR },
{ "sys_template_path", "systemplate" },
- { "lo_template_path", "/opt/collaboraoffice5.0" },
+ { "lo_template_path", "/opt/collaboraoffice5.1" },
{ "child_root_path", "jails" },
{ "lo_jail_subpath", "lo" },
{ "server_name", "" },
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 0bc47a0..9606d4c 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -12,7 +12,7 @@ case "$1" in
rm -rf /var/cache/loolwsd/*
# We assume that the LibreOffice to be used is built TDF-style
- # and installs in /opt/collaboraoffice5.0, and that /opt/lool is
+ # and installs in /opt/collaboraoffice5.1, and that /opt/lool is
# on the same file system
rm -rf /opt/lool
@@ -20,7 +20,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null 2>&1"
+ su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.1 >/dev/null 2>&1"
;;
esac
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 2b10a82..d298198 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -23,7 +23,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.0 collaboraoffice5.0-en-US collaboraoffice5.0-ure collaboraofficebasis5.0-core collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data collaboraofficebasis5.0-draw collaboraofficebasis5.0-base collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math collaboraofficebasis5.0-en-US-base
+Requires: collaboraoffice5.1 collaboraoffice5.1-en-US collaboraoffice5.1-ure collaboraofficebasis5.1-core collaboraofficebasis5.1-writer collaboraofficebasis5.1-impress collaboraofficebasis5.1-graphicfilter collaboraofficebasis5.1-en-US collaboraofficebasis5.1-calc collaboraofficebasis5.1-en-US-res collaboraofficebasis5.1-en-US-calc collaboraofficebasis5.1-ooofonts collaboraofficebasis5.1-images collaboraofficebasis5.1-filter-data collaboraofficebasis5.1-draw collaboraofficebasis5.1-base collaboraofficebasis5.1-en-US-writer collaboraofficebasis5.1-en-US-math collaboraofficebasis5.1-en-US-base
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
@@ -66,7 +66,7 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
%if %{default_admin} == "YES"
-sed -i "s|ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.0 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd --o:admin_console.username=admin --o:admin_console.password=admin|" loolwsd.service
+sed -i "s|ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd --o:admin_console.username=admin --o:admin_console.password=admin|" loolwsd.service
%endif
%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
@@ -130,7 +130,7 @@ rm -rf /var/cache/loolwsd/*
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=`rpm -ql collaboraoffice5.0 | grep '/soffice$' | sed -e 's-/program/soffice--'`
+loroot=`rpm -ql collaboraoffice5.1 | grep '/soffice$' | sed -e 's-/program/soffice--'`
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in
index c55cf30..b3251e4 100644
--- a/loolwsd/loolwsd.xml.in
+++ b/loolwsd/loolwsd.xml.in
@@ -5,7 +5,7 @@
<tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
<sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
- <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.0"></lo_template_path>
+ <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.1"></lo_template_path>
<child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
<server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
More information about the Libreoffice-commits
mailing list