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

[Tor Lillqvist]

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

New commits:
commit 1e8a22d4d647af34c3f933ae7ed25ae7e751b541
Author: Tor Lillqvist <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.31], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit a59f1769296c5dfb9ee1362635f7a4b70f6f9b07
Author: Tor Lillqvist <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.30], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit b317bfb9a06cbcf1fa76adea00f5293b2a271fc9
Author: Tor Lillqvist <tml at 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