loolwsd/Makefile.am | 2 ++
loolwsd/configure.ac | 2 +-
loolwsd/debian/postinst | 2 +-
loolwsd/loolwsd.spec.in | 16 +++++++---------
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 3f874060c4800be8615da5d0061f43dd662bdb9c
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 7 10:47:28 2015 +0300
Bump version after tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 77ca62e..0310075 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.1.2], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.3], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit db73d12cf221ef4b45117d48834b1625e106db99
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 7 10:12:13 2015 +0300
Bump version for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index d48924c..77ca62e 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.1.1], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.1.2], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit e29c77387901efcf92c3acaddce52875f4fd4dd2
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 9 22:33:46 2015 +0300
Include loolwsd.service and sysconfig.loolwsd in the tarball
(Instead of having them as separate SOURCEn in the loolwsd.spec.)
Both are related to systemd. The latter probably is relevant only for
openSUSE. (And I actually couldn't get what I tried doing in it to work, see
739edf9dcf464f407dfe663fb2f497b866e73333.)
(cherry picked from commit f8b29d666d52a3f18b0125aaed309fa3e4d719fb)
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 352bd1a..07b68ca 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -17,6 +17,8 @@ noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp
LOOLSession.hpp LOOLWSD.hpp Lo
bundled/include/LibreOfficeKit/LibreOfficeKit.h
bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
+EXTRA_DIST = loolwsd.service sysconfig.loolwsd
+
clean-cache:
# Intentionally don't use "*" below... Avoid risk of accidentally running rm
-rf /*
test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 9608bc5..9c579d4 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -22,8 +22,6 @@ Vendor: Collabora
Summary: LibreOffice On-Line WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
-Source1: loolwsd.service
-Source2: sysconfig.loolwsd
BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0
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
@@ -48,9 +46,9 @@ env BUILDING_FROM_RPMBUILD=yes make check
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
-%__install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/loolwsd.service
+%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
-install -D -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates
+install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
%files
/usr/bin/loolwsd
commit f1b4f7227825adc823329d32db0b490b2c7ced0d
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 9 19:32:34 2015 +0300
Adapt to the CP LO 5.0 beta1
(cherry picked from commit 9be670309fd107d29c4c54c58d2927968d777745)
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 63e84b7..9608bc5 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -25,10 +25,10 @@ Source0: loolwsd-@package_vers...@.tar.gz
Source1: loolwsd.service
Source2: sysconfig.loolwsd
BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0
systemd-rpm-macros
-# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
-# think. But the TDF packages include the version number in their
+# 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 libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-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}
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreoffice5.0 libreoffice5.0-en-US libreoffice5.0-ure
libobasis5.0-core libobasis5.0-writer libobasis5.0-impress
libobasis5.0-graphicfilter libobasis5.0-en-US libobasis5.0-calc
libobasis5.0-en-US-res libobasis5.0-en-US-calc libobasis5.0-ooofonts
libobasis5.0-images libobasis5.0-filter-data libobasis5.0-draw
libobasis5.0-base libobasis5.0-en-US-writer libobasis5.0-en-US-math
libobasis5.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}
%define owner lool
%define group lool
@@ -73,7 +73,7 @@ mkdir -p /var/cache/loolwsd && chmod og+w /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=`rpm -ql libreofficedev5.1 | grep '/soffice$' | sed -e
's-/program/soffice--'`
+loroot=`rpm -ql libreoffice5.0 | grep '/soffice$' | sed -e
's-/program/soffice--'`
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
commit baeeb92d1c5b7e6c7107e3be2e0597bf063caf00
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 7 09:57:43 2015 +0300
Add cap_mknod here, too
diff --git a/loolwsd/debian/postinst b/loolwsd/debian/postinst
index 7822fc1..f43e259 100755
--- a/loolwsd/debian/postinst
+++ b/loolwsd/debian/postinst
@@ -4,6 +4,6 @@ set -e
case "$1" in
configure)
- setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
+ setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
;;
esac
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index f3a857a..63e84b7 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -64,7 +64,7 @@ install -D -m 644 %{SOURCE2}
%{buildroot}/var/adm/fillup-templates
%service_add_pre loolwsd.service
%post
-setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
getent group %{group} >/dev/null || groupadd -r %{group}
getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
