[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - debian/control loolwsd.spec.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Jan 13 10:21:29 UTC 2019
debian/control | 2 +-
loolwsd.spec.in | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 230fcba26547acfb0bbdb58106777414b690e447
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jan 13 11:21:00 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jan 13 11:21:00 2019 +0100
reduce package dependencies
Change-Id: I8030e15f9c056833e387baf44d947220dd563266
diff --git a/debian/control b/debian/control
index 6067985c3..e77c55a84 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}, locales-all, adduser, fontconfig, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, libxcb-shm0, collaboraofficebasis6.0-calc (>= 6.0.10.18), collaboraofficebasis6.0-core (>= 6.0.10.18), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.18), collaboraofficebasis6.0-images (>= 6.0.10.18), collaboraofficebasis6.0-impress (>= 6.0.10.18), collaboraofficebasis6.0-ooofonts (>= 6.0.10.18), collaboraofficebasis6.0-writer (>= 6.0.10.18), collaboraoffice6.0 (>= 6.0.10.18), collaboraoffice6.0-ure (>= 6.0.10.18), collaboraofficebasis6.0-en-us (>= 6.0.10.18), collaboraofficebasis6.0-draw (>= 6.0.10.18), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.18), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.18), collaboraoffice6.0-dict-en (>= 6.0.10.18)
+Depends: ${shlibs:Depends}, ${misc:Depends}, locales-all, adduser, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.20), collaboraofficebasis6.0-core (>= 6.0.10.20), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.20), collaboraofficebasis6.0-images (>= 6.0.10.20), collaboraofficebasis6.0-impress (>= 6.0.10.20), collaboraofficebasis6.0-ooofonts (>= 6.0.10.20), collaboraofficebasis6.0-writer (>= 6.0.10.20), collaboraoffice6.0 (>= 6.0.10.20), collaboraoffice6.0-ure (>= 6.0.10.20), collaboraofficebasis6.0-en-us (>= 6.0.10.20), collaboraofficebasis6.0-draw (>= 6.0.10.20), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.20), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.20), collaboraoffice6.0-dict-en (>= 6.0.10.20)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-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 4cb2fb7bc..b44064517 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 >= 6.0.10.18 collaboraoffice6.0-ure >= 6.0.10.18 collaboraofficebasis6.0-core >= 6.0.10.18 collaboraofficebasis6.0-writer >= 6.0.10.18 collaboraofficebasis6.0-impress >= 6.0.10.18 collaboraofficebasis6.0-graphicfilter >= 6.0.10.18 collaboraofficebasis6.0-en-US >= 6.0.10.18 collaboraofficebasis6.0-calc >= 6.0.10.18 collaboraofficebasis6.0-ooofonts >= 6.0.10.18 collaboraofficebasis6.0-images >= 6.0.10.18 collaboraofficebasis6.0-draw >= 6.0.10.18 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.18 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.18 collaboraoffice6.0-dict-en >= 6.0.10.18
+Requires: collaboraoffice6.0 >= 6.0.10.20 collaboraoffice6.0-ure >= 6.0.10.20 collaboraofficebasis6.0-core >= 6.0.10.20 collaboraofficebasis6.0-writer >= 6.0.10.20 collaboraofficebasis6.0-impress >= 6.0.10.20 collaboraofficebasis6.0-graphicfilter >= 6.0.10.20 collaboraofficebasis6.0-en-US >= 6.0.10.20 collaboraofficebasis6.0-calc >= 6.0.10.20 collaboraofficebasis6.0-ooofonts >= 6.0.10.20 collaboraofficebasis6.0-images >= 6.0.10.20 collaboraofficebasis6.0-draw >= 6.0.10.20 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.20 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.20 collaboraoffice6.0-dict-en >= 6.0.10.20
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
@@ -46,15 +46,15 @@ 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: 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 libXrender libXxf86vm mesa-dri-drivers mesa-libGL
+Requires: expat fontconfig freetype
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
# loolwsd dependencies
Requires: systemd
-Requires: expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssl-libs pcre xz-libs zlib
+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: avahi-libs cups-libs dbus-libs fontconfig freetype libdrm libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrender libxshmfence libXxf86vm mesa-libGL mesa-libglapi
+Requires: expat fontconfig freetype
%endif
%if 0%{?suse_version}
@@ -69,14 +69,14 @@ Requires: libopenssl1_0_0 libpcre1 libz1
Requires: libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 libPocoJSON60 >= 1.9.0 libPocoNet60 >= 1.9.0 libPocoNetSSL60 >= 1.9.0 libPocoUtil60 >= 1.9.0 libPocoXML60 >= 1.9.0
# 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: 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
+Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16
%endif
# SLES11SP4
%if 0%{?suse_version} == 1110
Requires: libattr libopenssl0_9_8 pcre zlib
Requires: libPocoCrypto49 >= 1.7.9 libPocoFoundation49 >= 1.7.9 libPocoJSON49 >= 1.7.9 libPocoNet49 >= 1.7.9 libPocoNetSSL49 >= 1.7.9 libPocoUtil49 >= 1.7.9 libPocoXML49 >= 1.7.9
-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
+Requires: fontconfig freetype2 libexpat1
%endif
%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
@@ -194,7 +194,7 @@ getent group lool >/dev/null || groupadd -r lool
getent passwd lool >/dev/null || useradd -g lool -r lool -d /opt/lool -s /bin/bash
# for filename in `find /opt/lool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/lool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
-%triggerin -- Mesa arts atk atlas avahi-libs cairo cups-filters cups-libs dbus-1 dbus-1-glib dbus-glib dbus-libs dyninst enscript expat font-util fontconfig fonts-config freetype freetype2 gdk-pixbuf2 glib2 glibc glibc-locale gnutls graphviz gstreamer gstreamer-plugins-base gtk2 ifnteuro kernel keyutils-libs krb5 krb5-libs libICE libICE6 libSM libSM6 libX11 libX11-6 libXau libXau6 libXcomposite libXcomposite1 libXcursor libXcursor1 libXdamage libXdamage1 libXext libXext6 libXfixes libXfixes3 libXi libXi6 libXinerama libXinerama1 libXrender libXrender1 libXxf86vm libatk-1_0-0 libavahi-client3 libavahi-common3 libbz2-1 libcairo2 libcap libcap-ng libcap2 libcom_err libcom_err2 libdatrie1 libdbus-1-3 libdrm libexpat1 libffi libffi4 libfreetype6 libgcc libgcc_s1 libgcrypt libgdk_pixbuf-2_0-0 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgpg-error libgraphite2-3 libgstinterfaces-0_10-0 libgstreamer-0_10-0 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libiscsi libkeyutils1 l
iblangtag liblangtag1 libopenssl0_9_8 libopenssl1_0_0 libpango-1_0-0 libpcre1 libpixman-1-0 libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libselinux libselinux1 libstdc++ libstdc++6 libtasn1 libthai0 libuuid libuuid1 libxcb libxcb-render0 libxcb-shm0 libxcb1 libxshmfence libz1 lsb mariadb-libs mesa-dri-drivers mesa-libEGL mesa-libGL mesa-libgbm mesa-libglapi mysql-libs netcfg nss-mdns nss-softokn-freebl openssl-libs pango pcre pixman qt3 redhat-lsb-core samba-client samba-winbind samba-winbind-clients setup sssd sssd-client systemd-libs timezone tzdata xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXrender xorg-x11-libs xorg-x11-libxcb xterm xulrunner zlib
+%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
echo -ne "Triggered update of loolwsd systemplate..."
More information about the Libreoffice-commits
mailing list