loolwsd/configure.ac | 2 +- loolwsd/debian/control | 2 +- loolwsd/debian/loolwsd.postinst | 4 ++-- loolwsd/debian/loolwsd.service | 2 +- loolwsd/loolwsd.service | 2 +- loolwsd/loolwsd.spec.in | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 510db7bbdcea6c8f5a151ad5a9cafc19c72909a8 Author: Andras Timar <[email protected]> Date: Fri Oct 30 13:19:36 2015 +0100 loolwsd: bump version after tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 41a0990..74efe11 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.4], [[email protected]]) +AC_INIT([loolwsd], [1.4.5], [[email protected]]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit 16f8e75d1dc7ee1ae444d4b1682eba087b66d5fd Author: Andras Timar <[email protected]> Date: Fri Oct 30 13:19:10 2015 +0100 loolwsd: bump version before tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 5f570ee..41a0990 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.3], [[email protected]]) +AC_INIT([loolwsd], [1.4.4], [[email protected]]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit 87554d1be95517b74a1e57b26b2562515a05ed01 Author: Andras Timar <[email protected]> Date: Fri Oct 30 13:18:35 2015 +0100 Collabora Office as requirement diff --git a/loolwsd/debian/control b/loolwsd/debian/control index 7c20090..aed5804 100644 --- a/loolwsd/debian/control +++ b/loolwsd/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.2 Package: loolwsd Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libreoffice5.0 +Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraoffice5.0 Description: LibreOffice On-Line WebSocket Daemon LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice services. diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst index 5b9160e..c00c723 100755 --- a/loolwsd/debian/loolwsd.postinst +++ b/loolwsd/debian/loolwsd.postinst @@ -10,14 +10,14 @@ case "$1" in mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd # We assume that the LibreOffice to be used is built TDF-style - # and installs in /opt/libreoffice5.0, and that /opt/lool is + # and installs in /opt/collaboraoffice5.0, and that /opt/lool is # on the same file system mkdir -p /opt/lool/child-roots chown lool /opt/lool/child-roots rm -rf /opt/lool/systemplate - su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice5.0 >/dev/null" + su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null" ;; esac diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service index 19fb82c..8e410f8 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 --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 +ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 User=lool KillMode=process Restart=always diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service index 19fb82c..8e410f8 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 --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 +ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 User=lool KillMode=process Restart=always diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in index 9d4720c..6bb3090 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 syste # This works for now only with a CP build of 5.0, I think. The TDF # (and thus also CP) packages include the version number in their # names. How clever is that? So we need to specify one. -Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 libPocoNet30 >= 1.6.0 libreoffice5.0 libreoffice5.0-en-US libreoffice5.0-ure libobasis5.0-core libobasis5.0-writer libobasis5.0-impress libobasis5.0-graphicfilter libobasis5.0-en-US libobasis5.0-calc libobasis5.0-en-US-res libobasis5.0-en-US-calc libobasis5.0-ooofonts libobasis5.0-images libobasis5.0-filter-data libobasis5.0-draw libobasis5.0-base libobasis5.0-en-US-writer libobasis5.0-en-US-math libobasis5.0-en-US-base Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq} +Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 libPocoNet30 >= 1.6.0 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 Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq} %define owner lool %define group lool @@ -75,7 +75,7 @@ mkdir -p /var/cache/loolwsd && chmod og+w /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 libreoffice5.0 | grep '/soffice$' | sed -e 's-/program/soffice--'` +loroot=`rpm -ql collaboraoffice5.0 | grep '/soffice$' | sed -e 's-/program/soffice--'` loolparent=`cd ${loroot} && cd .. && /bin/pwd` rm -rf ${loolparent}/lool _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
