From 6c4e3cf1a9f79eb4c521e1049f5c625b60453a33 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 25 Jun 2015 14:55:23 +1000 Subject: [PATCH] ctdb-packaging: Package private libraries Remove the private libraries from builtin_libraries and package them instead. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Wed Jul 1 07:19:43 CEST 2015 on sn-devel-104 --- ctdb/configure.rpm | 2 +- ctdb/packaging/RPM/ctdb.spec.in | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ctdb/configure.rpm b/ctdb/configure.rpm index ff7eace2815..32e6673d310 100755 --- a/ctdb/configure.rpm +++ b/ctdb/configure.rpm @@ -7,7 +7,7 @@ else fi CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ - --builtin-libraries=replace,popt,samba-debug,socket-blocking,tdb-wrap \ + --builtin-libraries=replace,popt \ --bundled-libraries=!talloc,!tevent,!tdb \ --minimum-library-version=talloc:2.0.8,tdb:1.2.11,tevent:0.9.16 \ --prefix=/usr \ diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 98dd3027c12..ce7d8a629e9 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -88,7 +88,7 @@ fi export CC CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \ - --builtin-libraries=replace,popt,samba-debug,socket-blocking,tdb-wrap \ + --builtin-libraries=replace,popt \ --bundled-libraries=!talloc,!tevent,!tdb \ --minimum-library-version=talloc:%libtalloc_version,tdb:%libtdb_version,tevent:%libtevent_version \ %if %with_pcp_pmda @@ -199,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ltdbtool %{_bindir}/ctdb_diagnostics %{_bindir}/onnode +%dir %{_libdir} +%{_libdir}/ctdb/lib* %{_mandir}/man1/ctdb.1.gz %{_mandir}/man1/ctdbd.1.gz %{_mandir}/man1/ctdbd_wrapper.1.gz -- 2.11.4.GIT