[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/loolwsd.spec.in
loolwsd/configure.ac|2 +-
loolwsd/loolwsd.spec.in |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1e8a22d4d647af34c3f933ae7ed25ae7e751b541
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jun 1 16:34:24 2015 +0300
Bump version to 1.0.31 after release
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 78e9179..6fa7a55 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.30], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.31], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit a59f1769296c5dfb9ee1362635f7a4b70f6f9b07
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jun 1 16:07:22 2015 +0300
Bump version to 1.0.30 for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 0224bb0..78e9179 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.29], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.30], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit b317bfb9a06cbcf1fa76adea00f5293b2a271fc9
Author: Tor Lillqvist t...@collabora.com
Date: Mon Jun 1 15:50:56 2015 +0300
Add the packages that the TDF build of LO should require (but doesn't)
LibreOffice from TDF, packaged in RPM, does not have proper dependencies as
it
is supposed to be usable on different distros and can't know what names are
used for packages for system libraries used, like the one containing
libdbus-glib. But we must have all dependent libraries installed when
running
the loolwsd-systemplate-setup command in the %post phase. As this spec file
de
facto is for openSUSE 13.2 only anyway, we can find out the package names
and
depend on them...
Add the list from running:
rpm -qf --queryformat '%{NAME} ' `find /opt/libreofficedev5.1 -name '*.so'
-o -name '*.so.[0-9]*' | while read file; do ldd $file; done | grep -v dynamic
| cut -d -f 3 | grep -E '^(/lib|/usr)/' | sort -u`
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 8162fa2..9e92ed6 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel = 1.6.0
# 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
# 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
+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
libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3
libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib
libdrm2 libexpat1 libffi4-gcc49 fontconfig libfreetype6 libgbm1 libgio-2_0-0
Mesa-libglapi0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5
libgthread-2_0-0 krb5 krb5 krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libstdc++6-gcc49 libuuid1 libwayland-client0 libwayland-server0 libxcb-dri2-
0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0
libxcb-sync1 libxcb-xfixes0 libxcb1 libxml2-2 libxshmfence1
%define owner lool
%define group lool
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/loolwsd.spec.in loolwsd/Makefile.am
loolwsd/Makefile.am | 11 ++-
loolwsd/configure.ac|2 +-
loolwsd/loolwsd.spec.in |6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 3ed22306e8290d62356e4cb622e81bf02a74b27d
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 10:10:20 2015 +0300
Post-release bump to 1.0.27
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 09bc062..ae8351b 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.26], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.27], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 47aa6c74ed34255b8ce58293559414a55290bbf9
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 10:06:48 2015 +0300
Bump version to 1.0.26 for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index e1567f9..09bc062 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.25], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.26], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 775603a7363317fed47a2f9e5ec1edd5c4b527f1
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 09:56:32 2015 +0300
Don't use sudo to run setcap when building from rpmbuild
Not a good idea to run an interactive command during a non-interactive
make. We do the setcap in the %post step in the spec file anyway.
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 33a24de..06d9ce3 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -24,9 +24,10 @@ clean-cache:
# it already after a plain 'make' to allow for testing without
# installing.
all-local: loolwsd
- if test `uname -s` = Linux; then \
- sudo @SETCAP@ cap_fowner,cap_sys_chroot=ep loolwsd; \
- else \
- sudo chown root loolwsd sudo chmod u+s loolwsd; \
+ if test $$BUILDING_FROM_RPMBUILD != yes; then \
+ if test `uname -s` = Linux; then \
+ sudo @SETCAP@ cap_fowner,cap_sys_chroot=ep loolwsd; \
+ else \
+ sudo chown root loolwsd sudo chmod u+s loolwsd; \
+ fi; \
fi
-
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 6ee3c38..2a63210 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -38,13 +38,13 @@ Requires: libcap libcap-progs libpng
libPocoFoundation30 = 1.6.0 libPocoN
%build
%configure --with-lokit-path=bundled/include
-make %{?_smp_mflags}
+env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%check
-make check
+env BUILDING_FROM_RPMBUILD=yes make check
%install
-make install DESTDIR=%{buildroot}
+env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
%files
/usr/bin/loolwsd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/loolwsd.spec.in
loolwsd/configure.ac|2 +-
loolwsd/loolwsd.spec.in |9 -
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 58e4e15c6a926abd940353d97c9c45eca557e9bf
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 18:36:37 2015 +0300
Post-release bump to 1.0.29
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 50d8672..0224bb0 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.28], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.29], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 9076ba8a752e7260a162bc53d22c9a485a8f889a
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 18:35:42 2015 +0300
Bump version to 1.0.28 for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index ae8351b..50d8672 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.27], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.28], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit b54731fdceb80554e5c02fa69029cf1e0b8552c9
Author: Tor Lillqvist t...@collabora.com
Date: Fri May 29 18:31:53 2015 +0300
We do need to require the LO packages
They need to be installed before loolwsd is installed, because our %post
action needs to know where LO is installed so that it can create the
systemplate and child-roots directories on the same file system where LO
is. Oh this is crazy and over-engineered. I wonder if it makes sense at all
to
even consider packaging this loolwsd in some generically useful way, or if
it
should be considered a manual thing for customers / users to install and
configure.
Sadly the TDF builds of LO use the version number in the package names, so
we
can't depend on *some* TDF build of LO (like = 5.0), but must have a
specific
version in this spec file. Sigh.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 2a63210..8162fa2 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -23,13 +23,14 @@ Summary:LibreOffice On-Line WebSocket Daemon
License:MPL
Source0:loolwsd-@package_vers...@.tar.gz
BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel = 1.6.0
-Requires: libcap libcap-progs libpng libPocoFoundation30 = 1.6.0
libPocoNet30 = 1.6.0
+# 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
+# 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
%define owner lool
%define group lool
-# This works for now only with the TDF nightly builds of 5.0 or 5.1, I think
-
%description
%prep
@@ -62,9 +63,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
-# First look for TDF libreofficedev5.1, then 5.0
loroot=`rpm -ql libreofficedev5.1 | grep '/soffice$' | sed -e
's-/program/soffice--'`
-test -z $loroot loroot=`rpm -ql libreofficedev5.0 | grep '/soffice$' |
sed -e 's-/program/soffice--'`
loolparent=`cd ${loroot} cd .. /bin/pwd`
rm -rf ${loolparent}/lool
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
