[Libreoffice-commits] online.git: 4 commits - configure.ac debian/changelog debian/control debian/rules .gitreview loolkitconfig.xcu loolwsd.spec.in
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jan 10 11:18:15 UTC 2020
.gitreview | 2
configure.ac | 2
debian/changelog | 26 +++++++----
debian/control | 18 -------
debian/rules | 4 +
loolkitconfig.xcu | 9 +--
loolwsd.spec.in | 125 ++++++++++++++++++++----------------------------------
7 files changed, 75 insertions(+), 111 deletions(-)
New commits:
commit 684aafd0e17d676d5e0e6a0d81fbb3920ff3dd3c
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jan 10 12:17:43 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jan 10 12:17:43 2020 +0100
Revert "Bump package version to 4.2.0-3 and update deb/rpm package files"
This reverts commit b0b2e8f5e8cb592774c586677bb7cb7d7962da63.
diff --git a/configure.ac b/configure.ac
index ee23bcc3c..9b1b50a91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [4.2.0], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [master], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index a81097de9..56cbc5563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,25 @@
-loolwsd (4.2.0-3) unstable; urgency=medium
+loolwsd (1.8.2-1) unstable; urgency=medium
- * see the git log: http://col.la/cool420
+ * Fix crash in Impress.
- -- Andras Timar <andras.timar at collabora.com> Thu, 09 Jan 2020 22:12:00 +0100
+ -- Jan Holesovsky <kendy at collabora.com> Thu, 11 Aug 2016 16:46:00 +0100
-loolwsd (4.2.0-2) unstable; urgency=medium
+loolwsd (1.8.0-1) unstable; urgency=medium
- * see the git log: http://col.la/cool420
+ [ Tor Lillqvist ]
+ * Back to packaging this for Debian.
- -- Andras Timar <andras.timar at collabora.com> Fri, 20 Dec 2019 13:27:00 +0100
+ [ Jan Holesovsky ]
+ * Update to match Collabora Office 5.1
-loolwsd (4.2.0-1) unstable; urgency=medium
+ -- Jan Holesovsky <kendy at collabora.com> Fri, 05 Aug 2016 16:51:54 +0100
- * see the git log: http://col.la/cool420
+loolwsd (1.0.0-1) unstable; urgency=low
- -- Andras Timar <andras.timar at collabora.com> Tue, 10 Dec 2019 20:47:00 +0100
+ * Initial release
+
+ * Local Variables:
+ * Mode: fundamental
+ * End:
+
+ -- Tor Lillqvist <tml at collabora.com> Fri, 15 May 2015 11:10:20 +0300
diff --git a/debian/control b/debian/control
index a4dc03ff6..532367872 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,13 @@ Source: loolwsd
Section: web
Priority: optional
Maintainer: Andras Timar <andras.timar at collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
- collaboraofficebasis6.2-calc,
- collaboraofficebasis6.2-core,
- collaboraofficebasis6.2-graphicfilter,
- collaboraofficebasis6.2-images,
- collaboraofficebasis6.2-impress,
- collaboraofficebasis6.2-ooofonts,
- collaboraofficebasis6.2-writer,
- collaboraoffice6.2,
- collaboraoffice6.2-ure,
- collaboraofficebasis6.2-en-us,
- collaboraofficebasis6.2-draw,
- collaboraofficebasis6.2-extension-pdf-import,
- collaboraofficebasis6.2-ooolinguistic
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/rules b/debian/rules
index feb980c95..d675675c0 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,3 +19,7 @@ override_dh_auto_test:
override_dh_installinit:
# no init.d scripts here, assume systemd
+
+override_dh_gencontrol:
+ # put package names of LibreOffice here
+ # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index c31d09921..d78760e82 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,45 +12,39 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
-Release: 3%{?dist}
+Release: 1%{?dist}
Vendor: %{vendor}
Summary: LibreOffice Online WebSocket Daemon
License: MPL
Source0: loolwsd- at PACKAGE_VERSION@.tar.gz
-BuildRequires: libcap-devel libpng-devel pam-devel gcc-c++ cppunit-devel pam-devel fontconfig make
-
-# Red Hat and CentOS
-%if 0%{?rhel} == 7
-BuildRequires: libpcap kernel-headers python36-polib python36-lxml
-%endif
-
-%if 0%{?rhel} == 8
-BuildRequires: libpcap kernel-headers python3-polib python3-lxml
-%endif
-
-# openSUSE Leap 15.x, SLES12, SLES15
+BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5 m4
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires: libpcap kernel-headers
+%else
%if 0%{?suse_version}
-BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml
+BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
+%endif
%endif
-Requires: collaboraoffice6.2 collaboraoffice6.2-ure collaboraofficebasis6.2-core collaboraofficebasis6.2-writer collaboraofficebasis6.2-impress collaboraofficebasis6.2-graphicfilter collaboraofficebasis6.2-en-US collaboraofficebasis6.2-calc collaboraofficebasis6.2-ooofonts collaboraofficebasis6.2-images collaboraofficebasis6.2-draw collaboraofficebasis6.2-extension-pdf-import collaboraofficebasis6.2-ooolinguistic
+Requires: %{lo_rpm_list}
+Requires: systemd
Requires(post): coreutils grep sed
-%if 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} >= 7
# loolwsd dependencies
-Requires: systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux 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
-
+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
+# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages (from TDF) 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
%if 0%{?suse_version}
# loolwsd dependencies
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: 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
+# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages (from TDF) do 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
%endif
-
%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
%else
@@ -70,31 +64,28 @@ Obsoletes: loleaflet <= 1.5.8
%configure \
--enable-silent-rules \
--with-lokit-path=bundled/include \
- --with-lo-path=/opt/collaboraoffice6.2 \
+ --with-lo-path=%{loroot} \
--disable-setcap \
%if 0%{?config_options:1}
%{config_options}
%endif
-env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
+make %{?_smp_mflags}
%check
-#env BUILDING_FROM_RPMBUILD=yes make check
+#make check
%install
-env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
+%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
-%if 0%{?rhel}
-install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
+%if 0%{?fedora} || 0%{?rhel} >= 7
install -D -m 644 sysconfig.loolwsd %{buildroot}/etc/sysconfig/loolwsd
-install -d -m 755 %{buildroot}/etc/httpd/conf
-install -D -m 755 etc/apache2/loolwsd.conf %{buildroot}/etc/httpd/conf
-rm %{buildroot}/etc/apache2/conf-available/loolwsd.conf
-%endif
+%else
%if 0%{?suse_version}
-install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
%endif
+%endif
mkdir -p %{buildroot}/etc/cron.d
echo "#Remove old tiles once every 10 days at midnight" > %{buildroot}/etc/cron.d/loolwsd.cron
echo "0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
@@ -103,7 +94,6 @@ echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/loolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
%files
-%defattr(-,root,root,-)
/usr/bin/loolwsd
/usr/bin/loolwsd-systemplate-setup
/usr/bin/loolforkit
@@ -114,33 +104,27 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
/usr/share/loolwsd/loleaflet
/usr/share/doc/loolwsd/README
/usr/share/doc/loolwsd/README.vars
-/usr/share/doc/loolwsd/metrics.txt
/usr/share/doc/loolwsd/protocol.txt
/usr/share/doc/loolwsd/reference.md
-/usr/share/man/man1/loolwsd.1.gz
-/usr/share/man/man1/loolforkit.1.gz
-/usr/share/man/man1/loolconvert.1.gz
-/usr/share/man/man1/loolconfig.1.gz
-/usr/share/man/man1/loolwsd-systemplate-setup.1.gz
+/usr/share/doc/loolwsd/metrics.txt
+/usr/share/man/man1/loolwsd.1
+/usr/share/man/man1/loolforkit.1
+/usr/share/man/man1/loolconvert.1
+/usr/share/man/man1/loolconfig.1
+/usr/share/man/man1/loolwsd-systemplate-setup.1
%{_unitdir}/loolwsd.service
-%if 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} >= 7
%config(noreplace) /etc/sysconfig/loolwsd
-%endif
+%else
%if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.loolwsd
%endif
+%endif
%config(noreplace) /etc/cron.d/loolwsd.cron
%config(noreplace) /etc/pam.d/loolwsd
%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
%config /etc/loolwsd/loolkitconfig.xcu
-%config(noreplace) /etc/nginx/snippets/loolwsd.conf
-%if 0%{?suse_version} > 0
-%config(noreplace) /etc/apache2/conf-available/loolwsd.conf
-%endif
-%if 0%{?rhel} > 0
-%config(noreplace) /etc/httpd/conf/loolwsd.conf
-%endif
%doc README
@@ -150,21 +134,17 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
%endif
getent group lool >/dev/null || groupadd -r lool
-getent passwd lool >/dev/null || useradd -g lool -r lool -d /opt/lool -s /bin/bash
+getent passwd lool >/dev/null || useradd -g lool -r lool
-# 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 -- 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..."
+%post
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-%if 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
+mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
+rm -rf /var/cache/loolwsd/*
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=/opt/collaboraoffice6.2
+loroot=%{loroot}
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
@@ -175,19 +155,7 @@ chown lool:lool ${loolparent}/lool/child-roots
fc-cache ${loroot}/share/fonts/truetype
loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null 2>&1
-%if 0%{?rhel} || 0%{?suse_version}
-if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl start loolwsd; fi
-%endif
-
-echo " Done."
-
-%post
-setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-
-mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
-rm -rf /var/cache/loolwsd/*
-
-%if 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_post loolwsd.service
%else
%if 0%{?suse_version}
@@ -196,8 +164,9 @@ rm -rf /var/cache/loolwsd/*
%endif
%endif
+
%preun
-%if 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_preun loolwsd.service
%else
%if 0%{?suse_version}
@@ -206,7 +175,7 @@ rm -rf /var/cache/loolwsd/*
%endif
%postun
-%if 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
%systemd_postun loolwsd.service
%else
%if 0%{?suse_version}
commit be731731397931cd4c15a4c81647e0a013f6857a
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jan 10 12:17:31 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jan 10 12:17:31 2020 +0100
Revert "[cp] Update the .gitreview for this branch."
This reverts commit d2a0779079df46af4d22cf086d2857742d2eed63.
diff --git a/.gitreview b/.gitreview
index be96fa926..6907d1470 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
port=29418
project=online
defaultremote=logerrit
-defaultbranch=distro/collabora/code-4.2.0-3
+defaultbranch=master
commit b31086f665ae9800324ec2335864a81128668d0a
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jan 10 12:17:23 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jan 10 12:17:23 2020 +0100
Revert "[cp] Use the collabora_svg theme and large icons for the sidebar"
This reverts commit 312075b9519c548d6252973610af73eea25d0d43.
diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 522b593d2..666b6a6cc 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -25,10 +25,7 @@
<!-- Enable thumbnail generation by default (disabling saves CPU time) -->
<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="GenerateThumbnail" oor:op="fuse"><value>true</value></prop></item>
-<!-- Use the collabora_svg theme for the sidebar -->
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>collabora_svg</value></prop></item>
-
-<!-- Use the large icons in the sidebar -->
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>2</value></prop></item>
+<!-- Use the colibre_svg theme for the sidebar -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>colibre_svg</value></prop></item>
</oor:items>
commit 4800c6c72f245fba7e5c071a7c4f0d9256f32174
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jan 10 12:17:15 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jan 10 12:17:15 2020 +0100
Revert "[cp] Collabora help URL"
This reverts commit 3a04dfa4bae05c252778fb09a94ce8536a7eb9f4.
diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index afad642f3..522b593d2 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -11,7 +11,7 @@
<item oor:path="/org.openoffice.Office.Common/AutoCorrect"><prop oor:name="TwoCapitalsAtStart" oor:op="fuse"><value>false</value></prop></item>
<!-- The Help root URL, or empty for no help (hides the help buttons) -->
-<item oor:path="/org.openoffice.Office.Common/Help"><prop oor:name="HelpRootURL" oor:op="fuse"><value>https://help.collaboraoffice.com/help.html?</value></prop></item>
+<item oor:path="/org.openoffice.Office.Common/Help"><prop oor:name="HelpRootURL" oor:op="fuse"><value>https://help.libreoffice.org/help.html?</value></prop></item>
<!-- Enable spell-checking by default -->
<item oor:path="/org.openoffice.Office.Linguistic/SpellChecking"><prop oor:name="IsSpellAuto" oor:op="fuse"><value>true</value></prop></item>
More information about the Libreoffice-commits
mailing list