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

[Andras Timar]

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

New commits:
commit 89ee9fd94b4821d1b5e4beefab8af7f28db065fe
Author: Andras Timar 
Date:   Mon Sep 26 10:17:51 2016 +0200

loolwsd: poco 1.7.5 as dependency of binary packages

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 6282775..80af0eb 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 6cb7970..73c5651 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -18,7 +18,7 @@ Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
 Source1:loleaflet-@package_vers...@.tar.gz
-BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.1
+BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  libpcap
 %else
@@ -33,7 +33,7 @@ Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7
 # loolwsd dependencies
 Requires:   expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc 
libpng libselinux openssl-libs pcre xz-libs zlib
-Requires:   poco-crypto >= 1.7.1 poco-foundation >= 1.7.1 poco-json >= 
1.7.1 poco-net >= 1.7.1 poco-netssl >= 1.7.1 poco-util >= 1.7.1 poco-xml >= 
1.7.1
+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 
does 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
 %else
@@ -41,7 +41,7 @@ Requires:   atk avahi-glib avahi-libs bzip2-libs cairo 
cups-libs dbus-glib d
 # loolwsd dependencies
 Requires(post): libcap-progs
 Requires:   libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1 
%{?systemd_requires} %{fillup_prereq}
-Requires:   libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 
libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1 
libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
+Requires:   libPocoCrypto45 >= 1.7.5 libPocoFoundation45 >= 1.7.5 
libPocoJSON45 >= 1.7.5 libPocoNet45 >= 1.7.5 libPocoNetSSL45 >= 1.7.5 
libPocoUtil45 >= 1.7.5 libPocoXML45 >= 1.7.5
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
does not have real dependencies)
 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
 %endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loolwsd/debian/loolwsd.postinst |1 +
 loolwsd/loolwsd.spec.in |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 625de77dd38c3f89a3520b6b0f3c71e06e615306
Author: Andras Timar 
Date:   Fri May 20 15:51:05 2016 +0200

loolwsd: packaging, setcap cap_sys_admin=ep /usr/bin/loolmount

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 73c3985..0bc47a0 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -5,6 +5,7 @@ set -e
 case "$1" in
 configure)
setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit || 
true
+   setcap cap_sys_admin=ep /usr/bin/loolmount || true
 
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index f07d695..3b44edc 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -122,6 +122,7 @@ getent passwd lool >/dev/null || useradd -g lool -r lool
 
 %post
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+setcap cap_sys_admin=ep /usr/bin/loolmount
 
 mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
 rm -rf /var/cache/loolwsd/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits