loolwsd/loolwsd.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 93e11045056c36612713d990ae5dc72cccbb3717
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jun 27 09:27:25 2016 +0200
loolwsd: use the new command line options in spec file for default admin
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 7dd638d..2b10a82 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -66,7 +66,7 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
%if %{default_admin} == "YES"
-sed -i "s|ExecStart=/usr/bin/loolwsd --version
--systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0
--childroot=/opt/lool/child-roots --numprespawns=5
--fileserverroot=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd --version
--systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0
--childroot=/opt/lool/child-roots --numprespawns=5
--fileserverroot=/usr/share/loolwsd --admincreds=admin/admin|" loolwsd.service
+sed -i "s|ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.0
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd
--version --o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.0
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd --o:admin_console.username=admin
--o:admin_console.password=admin|" loolwsd.service
%endif
%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
