rpms/rust-podman-sequoia
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Unbundle capnproto

Browse Source 
Resolves: RHEL-131619
Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
Daiki Ueno 2025-11-27 12:40:26 +09:00
parent 3e46807cb1
commit 2d8fc6bf0f
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,5 +1,2 @@
/rust-podman-sequoia-0.1.0-vendor.tar.xz
/podman-sequoia-0.1.0.crate
/capnproto-c++-1.0.1.tar.gz
/rust-podman-sequoia-0.2.0-vendor.tar.xz
/podman-sequoia-0.2.0.crate

24
rust-podman-sequoia.spec
View File

@ -10,11 +10,9 @@
# RHEL: Use bundled deps as it doesn't ship Rust libraries
%global bundled_rust_deps 1
%global __brp_mangle_shebangs_exclude_from ^/usr/src/debug/.*$
%bcond bundled_capnproto 1
%else
# Fedora: Use only system Rust libraries
%global bundled_rust_deps 0
%bcond bundled_capnproto 0
%endif
Name: rust-podman-sequoia
@ -36,7 +34,6 @@ Source0: %{crates_source}
# --platform s390x-unknown-linux-gnu \
# --all-features=true
Source1: %{name}-%{version}-vendor.tar.xz
Source2: capnproto-c++-1.0.1.tar.gz
# Manually created patch for downstream crate metadata changes
# * default to the OpenSSL crypto backend of sequoia-openpgp
Patch: podman-sequoia-fix-metadata.diff
@ -50,11 +47,7 @@ BuildRequires: sqlite-devel
BuildRequires: cargo-rpm-macros >= 26
%endif
BuildRequires: clang-devel >= 3.5
%if %{with bundled_capnproto}
BuildRequires: gcc-c++
BuildRequires: cmake >= 3.1
%endif
BuildRequires: capnproto
%global _description %{expand:
A polyfill to use Sequoia as a signing backend for containers.}
@ -111,22 +104,7 @@ License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR A
%cargo_generate_buildrequires
%endif
%if %{with bundled_capnproto}
mkdir -p bundled_capnproto
pushd bundled_capnproto
tar --strip-components=1 -xf %{SOURCE2}
popd
%endif
%build
%if %{with bundled_capnproto}
pushd bundled_capnproto
%cmake -DBUILD_TESTING=OFF
%cmake_build
export PATH="$PWD/%{__cmake_builddir}/src/capnp:$PATH"
popd
%endif
# build script uses environment variables to populate the pkgconfig file
export PREFIX="%{_prefix}"
export LIBDIR="%{_libdir}"

1
sources
View File

@ -1,3 +1,2 @@
SHA512 (rust-podman-sequoia-0.2.0-vendor.tar.xz) = bd69c405a3d993f188df75397809487a73291409b5bfa4db6f44fa562ec5de9eaf88455ef3d01ead398454a44fa2c3f9f2ff75c2cf2782639ac73e145cc14398
SHA512 (podman-sequoia-0.2.0.crate) = 7eaec820cc7d66467b1d1df38ba7b39add76cfce028996530e2e8518c96c23fc9a610f49e0b565303e80774311e925575b5ba3c81dd21de4be524aa5cf259d7d
SHA512 (capnproto-c++-1.0.1.tar.gz) = c60291f433eea15a51e480e1679a4b9b3b5e67edebc445e371a7a32fce6ec5a7e4b440b17b2adc0565519ec369e3dae8ea727ae790a082a53ecd0d245b5275a9