loleaflet/Makefile | 10 ++++------
loolwsd/configure.ac | 2 +-
loolwsd/loolwsd.spec.in | 4 +++-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 05c650532593ab59673ed91dfcf88d0efc56d9b3
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 15:13:25 2015 +0300
Post-release bump to 1.0.19
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index c4bf5a2..198a5a4 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.17], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.19], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 4109d1cb5db0b90579ebf720bd895fd09a1a2996
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 15:12:21 2015 +0300
Avoid "cannot create directory: File exists" issues
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index d1166bc..c6dd746 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -62,7 +62,9 @@ getent passwd %{owner} >/dev/null || useradd -g %{group} -m
-r %{owner}
mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
-su - %{owner} -c 'mkdir lool-child-roots'
+su - %{owner} -c 'mkdir -p lool-child-roots'
+
+su - %{owner} -c "rm -rf /home/lool/lool-systemplate"
# Figure out where LO is installed
loroot=`rpm -ql %{sofficepackage} | grep '/soffice$' | sed -e
's-/program/soffice--'`
commit 85e98d523116b0eefffaf0c9d70328b964a22a58
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed May 27 14:45:53 2015 +0300
Don't put superfluous stuff in the tarball, and bump version to 1.0.2
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 3e7a928..d594672 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,24 +1,22 @@
# Version number of loleaflet, no need to be in sync with the loolwsd one
-VERSION=1.0.0
+VERSION=1.0.2
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
all:
- rm -rf dist plugins/draw-$(DRAW_VERSION)/dist
- mkdir dist plugins/draw-$(DRAW_VERSION)/dist
jake build
cd plugins/draw-$(DRAW_VERSION) && jake build
.PHONY: dist
-dist: all
+dist: all Makefile loleaflet.spec
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
- tar cf - dist plugins/draw-$(DRAW_VERSION)/dist 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 debug/document | (cd
loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
-loleaflet.spec: loleaflet.spec.in
+loleaflet.spec: loleaflet.spec.in Makefile
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <loleaflet.spec.in
>loleaflet.spec
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
