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

[Tor Lillqvist]

 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 <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.27], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 47aa6c74ed34255b8ce58293559414a55290bbf9
Author: Tor Lillqvist <tml at 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], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.0.26], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 775603a7363317fed47a2f9e5ec1edd5c4b527f1
Author: Tor Lillqvist <tml at 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