[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/loolwsd.spec.in

[Tor Lillqvist]

 loolwsd/configure.ac    |    2 +-
 loolwsd/loolwsd.spec.in |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 58e4e15c6a926abd940353d97c9c45eca557e9bf
Author: Tor Lillqvist <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.29], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 9076ba8a752e7260a162bc53d22c9a485a8f889a
Author: Tor Lillqvist <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.28], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit b54731fdceb80554e5c02fa69029cf1e0b8552c9
Author: Tor Lillqvist <tml at 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- at PACKAGE_VERSION@.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