[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - debian/control loolwsd.spec.in

[Andras Timar (via logerrit)]

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

New commits:
commit 3a801b576af0e361174ab91e149f1b5e2036436e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Nov 4 10:19:28 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Nov 4 10:19:28 2019 +0100

    update poco deps for some distros
    
    Change-Id: I811862d6fd5d955701e82807f0d2b5154e6bdf3a

diff --git a/debian/control b/debian/control
index 396c7d10e..585181e3b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Andras Timar <andras.timar at collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, python-polib, python-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, linux-libc-dev, nodejs, python-polib, python-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index db097c487..cf3c5199f 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -21,7 +21,7 @@ Vendor:         Collabora
 Summary:        LibreOffice On-Line WebSocket Daemon
 License:        MPL
 Source0:        loolwsd- at PACKAGE_VERSION@.tar.gz
-BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5 pam-devel gcc-c++ cppunit-devel pam-devel fontconfig python-lxml make
+BuildRequires:  libcap-devel libpng-devel gcc-c++ cppunit-devel pam-devel fontconfig python-lxml make
 
 # Red Hat and CentOS
 %if 0%{?fedora} || 0%{?rhel} >= 6
@@ -53,7 +53,6 @@ Requires:       avahi-libs cups-libs dbus-libs gnutls libdrm libgcc libgcrypt li
 # loolwsd dependencies
 Requires:       systemd
 Requires:       keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssl-libs pcre xz-libs zlib
-Requires:       poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >= 1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >= 1.7.5
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
 Requires:       expat fontconfig freetype
 Requires:       avahi-libs cups-libs dbus-libs libdrm libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrender libxshmfence libXxf86vm mesa-libGL mesa-libglapi
@@ -68,7 +67,6 @@ Requires:       libcap2 libpng12-0 %{fillup_prereq}
 %if 0%{?suse_version} >= 1300
 Requires:       systemd
 Requires:       libopenssl1_0_0 libpcre1 libz1
-Requires:       libPocoCrypto63 >= 1.9.3 libPocoFoundation63 >= 1.9.3 libPocoJSON63 >= 1.9.3 libPocoNet63 >= 1.9.3 libPocoNetSSL63 >= 1.9.3 libPocoUtil63 >= 1.9.3 libPocoXML63 >= 1.9.3
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
 # cd /opt/collaboraoffice6.0/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
 Requires:       fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16