[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2018-03-14 Thread Andras Timar 
 loolwsd.spec.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 29d9c26260a1187f202563b95e359e75911d70e2
Author: Andras Timar 
Date:   Wed Mar 14 12:16:38 2018 +0100

fix Poco dependency on SUSE

Change-Id: Ia6a00ff7abcdc56497902aff432c91178d0916d5

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 223e6b56e..d3d9746d6 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -60,12 +60,12 @@ Requires:   atk avahi-glib avahi-libs bzip2-libs cairo 
cups-libs dbus-glib d
 # loolwsd dependencies
 Requires(post): libcap-progs
 Requires:   libcap2 libpng12-0 %{fillup_prereq}
-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
 %endif
 
 %if 0%{?suse_version} >= 1300
 Requires:   systemd
 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/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
@@ -74,6 +74,7 @@ Requires:   Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 
cups-libs dbus-1-glib fo
 # 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:   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
 %endif
 %if 0%{?name_suffix:1}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-10-02 Thread Andras Timar 
 loolwsd.spec.in |   68 ++--
 1 file changed, 32 insertions(+), 36 deletions(-)

New commits:
commit 913049a28d6daeae1744d9e2ee7f76ca4ac87c6c
Author: Andras Timar 
Date:   Fri Sep 22 10:15:12 2017 +0200

rpm trigger: rework

triggerin script runs after post script, therefore the original concept was 
wrong,
a stupid idea from stackoverflow. Let's build the systemplate in triggerin 
script
not in post, in order to avoid building it twice.

Change-Id: I911b38b6fd3d617f43ee1a13c7dff64dd499ef1c
Reviewed-on: https://gerrit.libreoffice.org/42621
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 35c0b677..1485e2c3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -165,7 +165,6 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 %doc README
 
 %pre
-touch /tmp/loolwsd_install_in_progress
 %if 0%{?suse_version} >= 1300
 %service_add_pre loolwsd.service
 %endif
@@ -175,37 +174,49 @@ getent passwd lool >/dev/null || useradd -g lool -r lool 
-d /opt/lool -s /bin/ba
 
 # 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 libXrandr libXrandr2 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 li
 biscsi libkeyutils1 liblangtag 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
-# do not run the trigger when loolwsd package itself is installed/updated
-if [ ! -f /tmp/loolwsd_install_in_progress ]; then
-echo -ne "Triggered update of loolwsd systemplate..."
+
+echo -ne "Triggered update of loolwsd systemplate..."
+
 %if 0%{?rhel} == 6
-if [ -f /var/lock/subsys/loolwsd ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
+if [ -f /var/lock/subsys/loolwsd ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
 %endif
+
 %if 0%{?suse_version} == 1110
-if [ -f /var/run/loolwsd.pid ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
+if [ -f /var/run/loolwsd.pid ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
 %endif
+
 %if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
-if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd stop; fi
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd stop; fi
 %endif
+
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
-systemctl is-active -q loolwsd && LOOLWSD_IS_ACTIVE=1 || 
LOOLWSD_IS_ACTIVE=0
-if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl stop loolwsd; fi
-%endif
-loroot=/opt/collaboraoffice5.3
-loolparent=`cd ${loroot} && cd .. && /bin/pwd`
-rm -rf ${loolparent}/lool
-mkdir -p ${loolparent}/lool/child-roots
-chown lool:lool ${loolparent}/lool
-chown lool:lool ${loolparent}/lool/child-roots
-su lool -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate 
${loroot} >/dev/null 2>&1"
+systemctl is-active -q loolwsd && LOOLWSD_IS_ACTIVE=1 || LOOLWSD_IS_ACTIVE=0
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl stop loolwsd; fi
+%endif
+
+# Figure out where LO is installed, let's hope it is not a mount point
+# Create a directory for loolwsd on the same file

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-09-20 Thread Andras Timar 
 loolwsd.spec.in |   37 -
 1 file changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 7ee5da9ee70b184fa613ff04d3196bb561ecd456
Author: Andras Timar 
Date:   Tue Sep 12 11:21:08 2017 +0200

rpm trigger: update systemplate when its packages are updated

Change-Id: I6ea7904a2d397c35259ecb3f0280dbc354d078dc
Reviewed-on: https://gerrit.libreoffice.org/42190
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index ff3c000b..fd41cead 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -165,6 +165,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 %doc README
 
 %pre
+touch /tmp/loolwsd_install_in_progress
 %if 0%{?suse_version} >= 1300
 %service_add_pre loolwsd.service
 %endif
@@ -172,6 +173,40 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 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 libXrandr libXrandr2 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 li
 biscsi libkeyutils1 liblangtag 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
+# do not run the trigger when loolwsd package itself is installed/updated
+if [ ! -f /tmp/loolwsd_install_in_progress ]; then
+echo -ne "Triggered update of loolwsd systemplate..."
+%if 0%{?rhel} == 6
+if [ -f /var/lock/subsys/loolwsd ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
+%endif
+%if 0%{?suse_version} == 1110
+if [ -f /var/run/loolwsd.pid ]; then LOOLWSD_IS_ACTIVE=1; else 
LOOLWSD_IS_ACTIVE=0; fi
+%endif
+%if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd stop; fi
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
+systemctl is-active -q loolwsd && LOOLWSD_IS_ACTIVE=1 || 
LOOLWSD_IS_ACTIVE=0
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl stop loolwsd; fi
+%endif
+loroot=/opt/collaboraoffice5.3
+loolparent=`cd ${loroot} && cd .. && /bin/pwd`
+rm -rf ${loolparent}/lool
+mkdir -p ${loolparent}/lool/child-roots
+chown lool:lool ${loolparent}/lool
+chown lool:lool ${loolparent}/lool/child-roots
+su lool -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate 
${loroot} >/dev/null 2>&1"
+%if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd start; fi
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl start loolwsd; fi
+%endif
+echo "   Done."
+fi
+
 %post
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
 setcap cap_sys_admin=ep /usr/bin/loolmount
@@ -205,7 +240,7 @@ su lool -c "loolwsd-systemplate-setup 
${loolparent}/lool/systemplate ${loroot} >
 %{fillup_only -n loolwsd}
 %endif
 %endif
-
+rm /tmp/loolwsd_install_in_progress
 
 %preun
 %if 0%{?fedora} || 0%{?rhel} >= 7

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-08-17 Thread Jan Holesovsky 
 loolwsd.spec.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6fa4cb8661317a29594726bdc81787af95dd24a
Author: Jan Holesovsky 
Date:   Thu Aug 17 22:48:30 2017 +0200

No libpcap on CentOS6.

Change-Id: I2a430e97b49818772a9459d0326f1326fabc9823

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 1a8c45cf..81e743f6 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -24,7 +24,7 @@ Source0:loolwsd-@package_vers...@.tar.gz
 BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5
 
 # Red Hat and CentOS
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  libpcap
 %endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-08-14 Thread Andras Timar 
 loolwsd.spec.in |   63 +---
 1 file changed, 42 insertions(+), 21 deletions(-)

New commits:
commit a0dc3b13d679d6219cf50f860645572685fb2449
Author: Andras Timar 
Date:   Fri Aug 11 07:09:25 2017 +0200

SLES11SP4 packaging bits

Change-Id: If245e4dd16cbde4d061c9a3143c50f7c65cf2b2b
Reviewed-on: https://gerrit.libreoffice.org/41001
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 0fdf0382..ed120148 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -13,17 +13,29 @@ Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
 Release:3%{?dist}
+%if 0%{?suse_version} == 1110
+Group:  Productivity/Office/Suite
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%endif
 Vendor: Collabora
 Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
 BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5
-%if 0%{?fedora} || 0%{?rhel} >= 7
+
+# Red Hat and CentOS
+%if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:  libpcap
-%else
-%if 0%{?suse_version}
+%endif
+
+# openSUSE and SLES12
+%if 0%{?suse_version} >= 1300
 BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
+
+# SLES11SP4
+%if 0%{?suse_version} == 1110
+BuildRequires:  libcap-progs
 %endif
 
 Requires:   collaboraoffice5.3 >= 5.3.10.22 collaboraoffice5.3-ure >= 
5.3.10.22 collaboraofficebasis5.3-core >= 5.3.10.22 
collaboraofficebasis5.3-writer >= 5.3.10.22 collaboraofficebasis5.3-impress >= 
5.3.10.22 collaboraofficebasis5.3-graphicfilter >= 5.3.10.22 
collaboraofficebasis5.3-en-US >= 5.3.10.22 collaboraofficebasis5.3-calc >= 
5.3.10.22 collaboraofficebasis5.3-en-US-res >= 5.3.10.22 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.22 
collaboraofficebasis5.3-ooofonts >= 5.3.10.22 collaboraofficebasis5.3-images >= 
5.3.10.22 collaboraofficebasis5.3-noto-fonts >= 5.3.10.22 
collaboraofficebasis5.3-draw >= 5.3.10.22 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.22
@@ -42,17 +54,27 @@ Requires:   expat keyutils-libs krb5-libs libattr 
libcap libcom_err libgcc l
 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
-%else
+%endif
+
 %if 0%{?suse_version}
 # loolwsd dependencies
-Requires:   systemd
 Requires(post): libcap-progs
-Requires:   libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1 
%{?systemd_requires} %{fillup_prereq}
+Requires:   libcap2 libpng12-0 %{fillup_prereq}
 Requires:   libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8 
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8 
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
+%endif
+
+%if 0%{?suse_version} >= 1300
+Requires:   systemd
+Requires:   libopenssl1_0_0 libpcre1 libz1
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
-# /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
+# 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
 %endif
+
+# SLES11SP4
+%if 0%{?suse_version} == 1110
+Requires:   libattr libopenssl0_9_8 pcre zlib
+Requires:   cairo cups-libs

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-07-13 Thread Andras Timar 
 loolwsd.spec.in |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 2cd87187f4e27e958d740d40d747310769caa800
Author: Andras Timar 
Date:   Thu Jul 13 11:13:02 2017 +0200

CentOS6 package dependencies

Change-Id: I187106b024ea49b439194b2c515904b31c007e70

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 908a41ea..d6932b20 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -28,6 +28,13 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 
 Requires:   collaboraoffice5.3 >= 5.3.10.15 collaboraoffice5.3-ure >= 
5.3.10.15 collaboraofficebasis5.3-core >= 5.3.10.15 
collaboraofficebasis5.3-writer >= 5.3.10.15 collaboraofficebasis5.3-impress >= 
5.3.10.15 collaboraofficebasis5.3-graphicfilter >= 5.3.10.15 
collaboraofficebasis5.3-en-US >= 5.3.10.15 collaboraofficebasis5.3-calc >= 
5.3.10.15 collaboraofficebasis5.3-en-US-res >= 5.3.10.15 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.15 
collaboraofficebasis5.3-ooofonts >= 5.3.10.15 collaboraofficebasis5.3-images >= 
5.3.10.15 collaboraofficebasis5.3-noto-fonts >= 5.3.10.15 
collaboraofficebasis5.3-draw >= 5.3.10.15 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.15
 Requires(post): coreutils grep sed
+%if 0%{?rhel} == 6
+# loolwsd dependencies
+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
+%endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
 # loolwsd dependencies
 Requires:   systemd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-07-06 Thread Andras Timar 
 loolwsd.spec.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa6ac19e872f9b3af33933f7e5296b08263a7c56
Author: Andras Timar 
Date:   Thu Jul 6 23:12:24 2017 +0200

document how to get rpm dependencies

Change-Id: Ib0ed0b3b3d984011e51479bcd37fab545f1a884e

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 853e920b..908a41ea 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -43,6 +43,7 @@ Requires(post): libcap-progs
 Requires:   libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1 
%{?systemd_requires} %{fillup_prereq}
 Requires:   libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8 
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8 
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
+# /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
 %endif
 %endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.spec.in

2017-05-31 Thread Andras Timar 
 loolwsd.spec.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1f5a5576150e2dd610da23351ca63259caf49ca0
Author: Andras Timar 
Date:   Mon May 29 16:25:13 2017 +0200

package loolconfig to rpm

Change-Id: I04b8204fde23bd3c674ec622c959ff5ab7714d98
Reviewed-on: https://gerrit.libreoffice.org/38153
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 48692f9a..0bf866b7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -96,6 +96,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 /usr/bin/loolmount
 /usr/bin/loolstress
 /usr/bin/looltool
+/usr/bin/loolconfig
 /usr/share/loolwsd/discovery.xml
 /usr/share/loolwsd/favicon.ico
 /usr/share/loolwsd/robots.txt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits