[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  c65d174 ctdb-packaging: Set --libexecdir in RPM spec file
      from  ace23f0 ctdb-locking: Use real-time only for actual record or DB locking

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c65d174eaebaba6bc6944b7fb1532944c512a0cd
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Mar 1 12:20:35 2016 +1100

    ctdb-packaging: Set --libexecdir in RPM spec file
    
    If the files section uses %{_libexecdir} then CTDB must also be
    configured to build and install with the same path, otherwise rpmbuild
    can fail due to a mismatch.  "rpmbuild --showrc" indicates that the
    default %configure command sets:
    
            --libexecdir=%{_libexecdir} \
    
    A mismatch will occur on SUSE systems, where SLES 12 and OpenSUSE 12
    set _libexecdir to %{_exec_prefix}/lib.
    
    The failure was initially seen when testing on Debian where
    _libexecdir is set to %{_prefix}/lib/x86_64-linux-gnu, though Debian
    is an unlikely platform for building RPMs...
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Mar  7 14:43:15 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 ctdb/packaging/RPM/ctdb.spec.in | 1 +
 1 file changed, 1 insertion(+)


Changeset truncated at 500 lines:

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 2e13d3e..a8ed2d6 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -97,6 +97,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
 	--prefix=%{_prefix} \
 	--includedir=%{_includedir}/ctdb \
 	--libdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
 	--localstatedir="/var"


-- 
Samba Shared Repository