loleaflet/.gitignore | 1
loleaflet/Makefile | 3 --
loleaflet/loleaflet.spec.in | 50 -----------------------------------------
loolwsd/debian/loolwsd.service | 2 -
loolwsd/loolwsd.service | 2 -
loolwsd/loolwsd.spec.in | 15 +++++++++---
6 files changed, 13 insertions(+), 60 deletions(-)
New commits:
commit 8f93a5f526ed5c29dc3d95a572bdec993b24bd23
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Apr 14 17:08:42 2016 +0200
merge loleaflet and loolwsd rpm packages
diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 5153c38..4335c99 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -17,5 +17,4 @@ plugins/draw-0.2.4/npm-debug.log
coverage/
/load_test_out
/spec/data/load_test
-loleaflet.spec
*.tar.gz
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 025859d..d9c3c64 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,9 +38,6 @@ l10n: pot
rm po/loleaflet-ui.pot
rm po/loleaflet-help.pot
-loleaflet.spec: loleaflet.spec.in Makefile
- sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <loleaflet.spec.in
>loleaflet.spec
-
spec/data/load-test:
if [ ! -d spec/data/load_test ]; then \
mkdir -p spec/data/load_test; \
diff --git a/loleaflet/loleaflet.spec.in b/loleaflet/loleaflet.spec.in
deleted file mode 100644
index 297912e..0000000
--- a/loleaflet/loleaflet.spec.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# spec file for package loleaflet
-#
-# Copyright (c) 2015 Collabora
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-
-# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
-
-Name: loleaflet
-Version: @PACKAGE_VERSION@
-Release: 0
-Vendor: Collabora
-Summary: LibreOffice On-Line Javascript part
-License: MPL
-Source0: loleaflet-@package_vers...@.tar.gz
-BuildArchitectures: noarch
-
-%description
-
-%prep
-%setup -q
-
-%build
-
-%check
-
-%install
-mkdir -p %{buildroot}/srv/www/htdocs/loleaflet
-tar cf - . | (cd %{buildroot}/srv/www/htdocs/loleaflet && tar xf -)
-
-%files
-/srv/www/htdocs/loleaflet
-
-%doc README
-
-%post
-
-%changelog
-* Tue May 20 2015 Tor Lillqvist
-- Initial RPM release
-
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 136bad4..fdc32c5 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots
--numprespawns=5
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index fa89085..fdc32c5 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots
--numprespawns=5 --fileserverroot=/srv/www/htdocs/
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index fb7ee60..51101e5 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -22,11 +22,14 @@ Vendor: Collabora
Summary: LibreOffice On-Line WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
+Source1: loleaflet-@package_vers...@.tar.gz
BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.7.1
systemd-rpm-macros
# This works for now only with a CP build of 5.0, I think. The TDF
# (and thus also CP) packages include the version number in their
# names. How clever is that? So we need to specify one.
Requires: libcap libcap-progs libpng libPocoFoundation42 >= 1.7.1
libPocoNet42 >= 1.7.1 collaboraoffice5.0 collaboraoffice5.0-en-US
collaboraoffice5.0-ure collaboraofficebasis5.0-core
collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress
collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US
collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res
collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts
collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data
collaboraofficebasis5.0-draw collaboraofficebasis5.0-base
collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math
collaboraofficebasis5.0-en-US-base Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0
cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1
libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq}
+Provides: loleaflet = 1.5.8
+Obsoletes: loleaflet <= 1.5.8
%define owner lool
%define group lool
@@ -34,7 +37,8 @@ Requires: libcap libcap-progs libpng
libPocoFoundation42 >= 1.7.1 libPocoN
%description
%prep
-%setup -q
+%setup
+%setup -T -D -a 1
%build
%configure \
@@ -56,6 +60,9 @@ install -D -m 644 sysconfig.loolwsd
%{buildroot}/var/adm/fillup-templates
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 -name \"*.png\" -a -atime +10
-exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
+cd loleaflet-@PACKAGE_VERSION@
+mkdir -p %{buildroot}/usr/share/loolwsd/loleaflet
+tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet && tar xf -)
%files
/usr/bin/loolwsd
@@ -64,12 +71,12 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name
\"*.png\" -a -atime +10 -ex
/usr/bin/loolforkit
/usr/bin/loolmount
/usr/share/loolwsd/discovery.xml
+/usr/share/loolwsd/loleaflet
%{_unitdir}/loolwsd.service
/var/adm/fillup-templates/sysconfig.loolwsd
-%config(noreplace)
-/etc/cron.d/loolwsd.cron
-/etc/loolwsd/loolwsd.xml
+%config(noreplace) /etc/cron.d/loolwsd.cron
+%config(noreplace) /etc/loolwsd/loolwsd.xml
%doc README
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
