[Libreoffice-commits] online.git: 3 commits - loolwsd/loolwsd.spec.in loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am     |    1 +
 loolwsd/loolwsd.spec.in |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dd97dadad23faa4de3c0e21b1777b191aa110ecf
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 23 20:20:05 2016 +0100

    loolwsd: poco soname in loolwsd.spec

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 9f753fc..9d06a2f 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.7.1 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.7.1 libPocoNet30 >= 1.7.1 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}
+Requires:       libcap libcap-progs libpng libPocoFoundation42 >= 1.7.1 libPocoNet42 >= 1.7.1 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
commit 2c9536b8e633a336731afc38715ac4db41a27501
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 23 19:48:29 2016 +0100

    loolwsd: package discovery.xml

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 119f40e..9f753fc 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -59,6 +59,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -ex
 /usr/bin/loolmap
 /usr/bin/loolkit
 /usr/bin/loolbroker
+/usr/bin/discovery.xml
 %{_unitdir}/loolwsd.service
 /var/adm/fillup-templates/sysconfig.loolwsd
 /etc/cron.d/loolwsd.cron
commit f94cdbd36ce26fff56ac5e95d5d16c1e73f22502
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 23 19:46:32 2016 +0100

    loolwsd: add FileServer.hpp to dist

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index c498c45..28513ab 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -33,6 +33,7 @@ loolmap_SOURCES = loolmap.c
 noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp MasterProcessSession.hpp ChildProcessSession.hpp \
                  LOOLWSD.hpp LoadTest.hpp MessageQueue.hpp TileCache.hpp Util.hpp Png.hpp Common.hpp Capabilities.hpp \
                  Rectangle.hpp QueueHandler.hpp Admin.hpp Auth.hpp Storage.hpp AdminModel.hpp DocumentBroker.hpp \
+                 FileServer.hpp \
                  bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
                  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h