[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 3 commits - loleaflet/Makefile loolwsd/configure.ac loolwsd/loolwsd.spec.in

[Jan Holesovsky]

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

New commits:
commit e697b5ab895e79fd1242b0b1d0a632119e6dda2c
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Aug 4 23:15:33 2016 +0000

    Allow specifying a name suffix.

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index d298198..ace0c87 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -6,7 +6,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+%if 0%{?name_suffix:1}
+Name:           loolwsd%{name_suffix}
+%else
 Name:           loolwsd
+%endif
 Version:        @PACKAGE_VERSION@
 Release:        1%{?dist}
 Vendor:         Collabora
@@ -42,14 +46,14 @@ Requires:       libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 libPocoJSO
 Requires:       Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1 libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
 %endif
 %endif
-Provides:       loleaflet = 1.5.8
+Provides:       loleaflet = 1.5.8, loolwsd
 Obsoletes:      loleaflet <= 1.5.8
 
 %description
 
 %prep
-%setup
-%setup -T -D -a 1
+%setup -n loolwsd- at PACKAGE_VERSION@
+%setup -n loolwsd- at PACKAGE_VERSION@ -T -D -a 1
 
 %build
 %configure \
commit 023836c0a0b01c158f2c1695a884c8412f8658ac
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Aug 4 08:51:47 2016 +0000

    Bump version to 1.8.1 after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4a549c5..19bdd4b 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.8.0
+VERSION=1.8.1
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index a9c9378..dacbb28 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.8.0], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [1.8.1], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
commit 9d8411e30ea25364fd88e04db99b3add577940d9
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Aug 4 08:39:57 2016 +0000

    Bump version to 1.8.0 before tarball.

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 46f3e97..4a549c5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.7.3
+VERSION=1.8.0
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index fa87ed4..a9c9378 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.7.3], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [1.8.0], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])