[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/debian loolwsd/loolwsd.spec.in

[Tor Lillqvist]

 loolwsd/configure.ac    |    4 ++--
 loolwsd/debian/control  |    2 +-
 loolwsd/loolwsd.spec.in |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9d85937a551e71923ac91442f365bbb83704cdfa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 21 16:28:33 2016 +0200

    We need Poco 1.7.1 now after fb9c9a9ec7833e290833e1133780ac4b39a92bf7
    
    At least Poco::Net::Context::Params is new in Poco 1.7.

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index c896d62..f4993e9 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -131,8 +131,8 @@ AC_CHECK_HEADERS([Poco/Net/WebSocket.h],
 AC_MSG_CHECKING([POCO version])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <Poco/Version.h>
-#if POCO_VERSION < 0x01060000
-#error Require Poco 1.6.0 or newer
+#if POCO_VERSION < 0x01070100
+#error Require Poco 1.7.1 or newer
 #endif
 ])],
                   [AC_MSG_RESULT([OK])],
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index d1d4bd7..479093e 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist <tml at collabora.com>
-Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.6.0)
+Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
 Standards-Version: 3.9.2
 
 Package: loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index c2d8f5d..119f40e 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -22,11 +22,11 @@ Vendor:         Collabora
 Summary:        LibreOffice On-Line WebSocket Daemon
 License:        MPL
 Source0:        loolwsd- at PACKAGE_VERSION@.tar.gz
-BuildRequires:  libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 systemd-rpm-macros
+BuildRequires:  libcap-progs libcap-devel libpng-devel poco-devel >= 1.7.1 systemd-rpm-macros
 # 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 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 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}
 
 %define owner lool
 %define group lool