[packages/rpm] - use bubblewrap instead of podman for container tests
baggins
baggins at pld-linux.org
Mon Nov 25 10:38:54 CET 2024
commit 39ba304e37a43a6bd8ef9de82109c465efdfedf6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 25 09:30:07 2024 +0100
- use bubblewrap instead of podman for container tests
rpm.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 28787c7..2b71ffb 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -88,9 +88,8 @@ Patch33: dist-man.patch
URL: https://rpm.org/
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10
BuildRequires: bzip2-devel >= 1.0.2-17
+BuildRequires: bubblewrap
%{?with_plugins:BuildRequires: dbus-devel >= 1.3}
BuildRequires: elfutils-devel >= 0.159
BuildRequires: gettext-tools >= 0.19.2
@@ -104,11 +103,9 @@ BuildRequires: libmagic-devel
%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.0}
# needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 1:1.4.2-9
BuildRequires: lua-devel >= 5.2
BuildRequires: patch >= 2.2
BuildRequires: pkgconfig
-BuildRequires: podman
BuildRequires: popt-devel >= %{popt_ver}
BuildRequires: python3-modules >= 1:3.2
%if %{with python3}
@@ -658,6 +655,7 @@ cd build-cmake
%{cmake_on_off dbus WITH_DBUS} \
%{cmake_on_off fsverity WITH_FSVERITY} \
%{cmake_on_off apidocs WITH_DOXYGEN} \
+ -DMKTREE_BACKEND=bwrap \
-DENABLE_SQLITE=ON \
-DENABLE_NDB=ON \
-DENABLE_BDB_RO=ON \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/39ba304e37a43a6bd8ef9de82109c465efdfedf6
More information about the pld-cvs-commit
mailing list