[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - debian/control loolwsd.spec.in
Andras Timar
andras.timar at collabora.com
Mon Jan 22 15:09:01 UTC 2018
debian/control | 2 +-
loolwsd.spec.in | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 42a982030509f4d8a771e4718d71d34a946f0bc3
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Jan 19 14:24:23 2018 +0100
deb and rpm dependencies with CPLinux_LOKit.conf
Change-Id: I07e0b3684aeaf052f1dc2e0ea0c7bcd8a51604d5
Reviewed-on: https://gerrit.libreoffice.org/48196
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/debian/control b/debian/control
index 6ba48d65..d82f9908 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.36), collaboraofficebasis5.3-core (>= 5.3.10.36), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.36), collaboraofficebasis5.3-images (>= 5.3.10.36), collaboraofficebasis5.3-impress (>= 5.3.10.36), collaboraofficebasis5.3-ooofonts (>= 5.3.10.36), collaboraofficebasis5.3-writer (>= 5.3.10.36), collaboraoffice5.3 (>= 5.3.10.36), collaboraoffice5.3-ure (>= 5.3.10.36), collaboraofficebasis5.3-en-us (>= 5.3.10.36), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.36), collaboraofficebasis5.3-en-us-res (>= 5.3.10.36), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.36), collaboraofficebasis5.3-draw (>= 5.3.10.36), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.36), collaboraofficebasis5.3-filter-data (>= 5.3.10.36)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libxinerama1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, libxrandr2, collaboraofficebasis5.3-calc (>= 5.3.10.36), collaboraofficebasis5.3-core (>= 5.3.10.36), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.36), collaboraofficebasis5.3-images (>= 5.3.10.36), collaboraofficebasis5.3-impress (>= 5.3.10.36), collaboraofficebasis5.3-ooofonts (>= 5.3.10.36), collaboraofficebasis5.3-writer (>= 5.3.10.36), collaboraoffice5.3 (>= 5.3.10.36), collaboraoffice5.3-ure (>= 5.3.10.36), collaboraofficebasis5.3-en-us (>= 5.3.10.36), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.36), collaboraofficebasis5.3-en-us-res (>= 5.3.10.36), collaboraofficebasis5.3-noto-fonts (>= 5.3.10.36), collaboraofficebasis5.3-draw (>= 5.3.10.36), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.36), collaboraofficebasis5.3-filter-data (>= 5.3.10.36)
Conflicts: collaboraofficebasis5.3-gnome-integration, collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index f5ce3f80..2d11a684 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -46,7 +46,7 @@ Requires(post): coreutils grep sed
Requires: keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssl pcre zlib
Requires: poco-crypto >= 1.7.8 poco-foundation >= 1.7.8 poco-json >= 1.7.8 poco-net >= 1.7.8 poco-netssl >= 1.7.8 poco-util >= 1.7.8 poco-xml >= 1.7.8
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
-Requires: atk avahi-libs cairo cups-libs dbus-glib dbus-libs expat fontconfig freetype gdk-pixbuf2 glib2 gnutls gstreamer gstreamer-plugins-base gtk2 libdrm libgcc libgcrypt libgpg-error libICE libSM libtasn1 libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXrender libXxf86vm mesa-dri-drivers mesa-libGL pango pixman
+Requires: avahi-libs cups-libs dbus-libs expat fontconfig freetype gnutls libdrm libgcc libgcrypt libgpg-error libICE libSM libtasn1 libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrandr libXrender libXxf86vm mesa-dri-drivers mesa-libGL
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
# loolwsd dependencies
@@ -54,7 +54,7 @@ Requires: systemd
Requires: expat 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: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2 gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
+Requires: avahi-libs cups-libs dbus-libs fontconfig freetype libdrm libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrandr libXrender libxshmfence libXxf86vm mesa-libGL mesa-libglapi
%endif
%if 0%{?suse_version}
@@ -69,13 +69,13 @@ Requires: systemd
Requires: libopenssl1_0_0 libpcre1 libz1
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
# cd /opt/collaboraoffice5.3/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: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1 libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
+Requires: Mesa-libGL1 Mesa-libglapi0 cups-libs fontconfig krb5 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libkeyutils1 libpng16-16 libuuid1 libICE6 libselinux1 libSM6 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
%endif
# SLES11SP4
%if 0%{?suse_version} == 1110
Requires: libattr libopenssl0_9_8 pcre zlib
-Requires: cairo cups-libs dbus-1 dbus-1-glib fontconfig freetype2 glibc keyutils-libs krb5 libcom_err2 libdrm libexpat1 libgcc_s1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgstinterfaces-0_10-0 libgstreamer-0_10-0 libgthread-2_0-0 libopenssl0_9_8 libpixman-1-0 libpng12-0 libselinux1 libstdc++6 libuuid1 Mesa pcre xorg-x11-libICE xorg-x11-libs xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libxcb xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXrender zlib
+Requires: cups-libs fontconfig freetype2 glibc keyutils-libs krb5 libcom_err2 libdrm libexpat1 libgcc_s1 libstdc++6 libuuid1 Mesa pcre xorg-x11-libICE xorg-x11-libs xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libxcb xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXrender
%endif
%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
More information about the Libreoffice-commits
mailing list