From 4c2b3097b4039539f57ceb6aa129edd4eae77496 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 6 Mar 2019 14:36:01 +1100 Subject: [PATCH 1/2] ctdb-packaging: ctdb package should not own system library directory BUG: https://bugzilla.samba.org/show_bug.cgi?id=13838 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit b2b8dce4fc56c27ef0131104b316346565369dd7) --- ctdb/packaging/RPM/ctdb.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index d25735e06e0..60778117105 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -222,7 +222,7 @@ fi %{_bindir}/onnode %dir %{_libexecdir}/ctdb %{_libexecdir}/ctdb/* -%dir %{_libdir} +%dir %{_libdir}/ctdb %{_libdir}/ctdb/lib* %dir %{_datadir}/ctdb/events %{_datadir}/ctdb/events/* -- 2.20.1 From 6ea434fe6f535fa6616f42b4f44bc0a478611f35 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 6 Mar 2019 19:16:55 +1100 Subject: [PATCH 2/2] ctdb-packaging: Test package requires tcpdump BUG: https://bugzilla.samba.org/show_bug.cgi?id=13838 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit 957c38b65ca060eabe1e676f8dfb54839d706155) --- ctdb/packaging/RPM/ctdb.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 60778117105..efece159bdc 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -258,7 +258,7 @@ development libraries for ctdb Summary: CTDB test suite Group: Development/Tools Requires: ctdb = %{version} -Requires: nc +Requires: nc, tcpdump %description tests test suite for ctdb -- 2.20.1