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

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Thu May 21 12:11:49 UTC 2020


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

New commits:
commit 2f31fdfa3f72f1bbadb240167f5c9aed6d7c8665
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 21 14:11:21 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 21 14:11:21 2020 +0200

    openssh (ssh-keygen) is a new dependency of loolwsd-generate-proof-key
    
    Change-Id: I78c5f3c5fa9d16760a7f4d1d1a6e2ad6ba4a8386

diff --git a/debian/control b/debian/control
index 5184feb1d..816e193f6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: loolwsd
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, openssh-client,
  collaboraofficebasis6.2-calc,
  collaboraofficebasis6.2-core,
  collaboraofficebasis6.2-graphicfilter,
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 93f6303ab..8cc3a2ce3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -37,7 +37,7 @@ Requires:       collaboraoffice6.2 collaboraoffice6.2-ure collaboraofficebasis6.
 Requires(post): coreutils grep sed
 %if 0%{?rhel}
 # loolwsd dependencies
-Requires:       systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssl-libs pcre xz-libs zlib
+Requires:       systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssh-clients openssl-libs pcre xz-libs zlib
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
 Requires:       expat fontconfig freetype libuuid bzip2-libs
 %endif
@@ -48,7 +48,7 @@ Requires(post): libcap-progs
 Requires:       systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fillup_prereq}
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
 # cd /opt/collaboraoffice6.2/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 libuuid1
+Requires:       fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 openssh
 %endif
 
 %if 0%{?name_suffix:1}


More information about the Libreoffice-commits mailing list