loleaflet/Makefile | 8 ++++----
loolwsd/Connect.cpp | 3 +++
loolwsd/configure.ac | 2 +-
loolwsd/loolwsd.spec.in | 17 ++++++++++-------
4 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit d54acdd6fb738f4632628482126f50355f08019b
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:48:32 2015 +0300
Post-release bump to 1.0.21
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index fe29c25..4936d4a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.20], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.21], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 3747129da5f56ed3c0b4052b68516af0d245b9ba
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:47:50 2015 +0300
Bump version to 1.0.20
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 198a5a4..fe29c25 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.19], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.20], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit beb321d142353e42e90170ba69ca176f64f608cc
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:30:06 2015 +0300
Revert attempts at sanity
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 9c9ad4a..78ed48b 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
# Version number of loleaflet, no need to be in sync with the loolwsd one
-VERSION=1.0.4
+VERSION=1.0.6
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
@@ -10,16 +10,13 @@ all:
cd plugins/draw-$(DRAW_VERSION) && jake build
.PHONY: dist
-dist: all Makefile loleaflet.spec
+dist: all
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
- tar cf - dist/leaflet.js dist/leaflet.css dist/images \
- plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css
plugins/draw-$(DRAW_VERSION)/dist/images \
- src/scrollbar \
- debug/document | (cd loleaflet-$(VERSION) && tar xf -)
+ tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document
src/scrollbar | (cd loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
-loleaflet.spec: loleaflet.spec.in Makefile
+loleaflet.spec: loleaflet.spec.in
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <loleaflet.spec.in
>loleaflet.spec
commit 6b91320f695626591aca4c8991038cbc9f8f834b
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:29:57 2015 +0300
Intermediate non-working attempt at sanity
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index d594672..9c9ad4a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
# Version number of loleaflet, no need to be in sync with the loolwsd one
-VERSION=1.0.2
+VERSION=1.0.4
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
@@ -14,7 +14,10 @@ dist: all Makefile loleaflet.spec
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
- tar cf - dist/leaflet.js dist/leaflet.css dist/images
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css
plugins/draw-$(DRAW_VERSION)/dist/images debug/document | (cd
loleaflet-$(VERSION) && tar xf -)
+ tar cf - dist/leaflet.js dist/leaflet.css dist/images \
+ plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css
plugins/draw-$(DRAW_VERSION)/dist/images \
+ src/scrollbar \
+ debug/document | (cd loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
commit 2e6719faafbb2ffdcc5174624d7f7ae30f23e94a
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:28:22 2015 +0300
Tweak where the systemplate and child-root directories are put
They must be on the same file system where LO is installed, and the TDF
tarballs puts that in /opt, and on some Linuxes in default configuration
/opt
is on a different file system from /home, so we should not really use
/home/lool.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index c6dd746..5cc4dc5 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -58,18 +58,21 @@ make install DESTDIR=%{buildroot}
setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
getent group %{group} >/dev/null || groupadd -r %{group}
-getent passwd %{owner} >/dev/null || useradd -g %{group} -m -r %{owner}
+getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
-su - %{owner} -c 'mkdir -p lool-child-roots'
-
-su - %{owner} -c "rm -rf /home/lool/lool-systemplate"
-
-# Figure out where LO is installed
+# 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=`rpm -ql %{sofficepackage} | grep '/soffice$' | sed -e
's-/program/soffice--'`
+loolparent=`cd ${loroot} && cd .. && /bin/pwd`
+
+rm -rf ${loolparent}/lool
+mkdir -p ${loolparent}/lool/child-roots
+chown %{owner} ${loolparent}/lool
+chown %{owner} ${loolparent}/lool/child-roots
-su - %{owner} -c "loolwsd-systemplate-setup /home/lool/lool-systemplate
${loroot} >/dev/null"
+su %{owner} -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate
${loroot} >/dev/null"
%changelog
* Tue May 19 2015 Tor Lillqvist
commit 86b846d137655de18305618d300d30da3e6d3c02
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 16:27:52 2015 +0300
Accept URI on the command line
diff --git a/loolwsd/Connect.cpp b/loolwsd/Connect.cpp
index 734f38c..48f07df 100644
--- a/loolwsd/Connect.cpp
+++ b/loolwsd/Connect.cpp
@@ -126,6 +126,9 @@ public:
protected:
int main(const std::vector<std::string>& args) override
{
+ if (args.size() > 0)
+ _uri = URI(args[0]);
+
HTTPClientSession cs(_uri.getHost(), _uri.getPort());
HTTPRequest request(HTTPRequest::HTTP_GET, "/ws");
HTTPResponse response;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
