Remove bundled capnproto
Resolves: RHEL-177547
This commit is contained in:
parent
e94e7db12f
commit
6eaef0108e
@ -29,7 +29,6 @@ Source0: %{crate}-%{version}.tar.gz
|
||||
# --all-features
|
||||
# tar -czf ../%%{crate}-vendor-%%{version}.tar.gz vendor
|
||||
Source1: %{crate}-vendor-%{version}.tar.gz
|
||||
Source2: capnproto-c++-1.0.1.tar.gz
|
||||
Source3: vendor.toml
|
||||
# Manually created patch for downstream crate metadata changes
|
||||
# * switch crypto backend from Nettle to OpenSSL
|
||||
@ -48,8 +47,10 @@ BuildRequires: cargo-rpm-macros >= 24
|
||||
BuildRequires: openssl-devel
|
||||
# vendored rustqlite
|
||||
BuildRequires: sqlite-devel
|
||||
# vendored capnp needs both cli and development libraries
|
||||
BuildRequires: capnproto
|
||||
BuildRequires: capnproto-devel
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake >= 3.1
|
||||
|
||||
%global _description %{expand:
|
||||
@ -123,18 +124,8 @@ cat %{SOURCE3} >> .cargo/config.toml
|
||||
rm -vr subplot/
|
||||
rm -v tests/sq-subplot.rs
|
||||
|
||||
mkdir -p bundled_capnproto
|
||||
pushd bundled_capnproto
|
||||
tar --strip-components=1 -xf %{SOURCE2}
|
||||
popd
|
||||
|
||||
%build
|
||||
export ASSET_OUT_DIR=target/assets
|
||||
pushd bundled_capnproto
|
||||
%cmake -DBUILD_TESTING=OFF
|
||||
%cmake_build
|
||||
export PATH="$PWD/%{__cmake_builddir}/src/capnp:$PATH"
|
||||
popd
|
||||
|
||||
%cargo_build
|
||||
%{cargo_license_summary}
|
||||
|
||||
1
sources
1
sources
@ -1,3 +1,2 @@
|
||||
SHA512 (sequoia-sq-vendor-1.3.1.1.tar.gz) = 7e23b5466f8b951b4324c64d5a04807d5d2865d80b11c9be52ea48564984378e69501e8d67f387fa66bef0a874bb1588f31be63423a3f5ad2f04632f737e2fd8
|
||||
SHA512 (sequoia-sq-1.3.1.1.tar.gz) = 652549f83aba9e3dbe95b9bf16824e1bd0ac12922a14b5d5c78af88da6d333ea43b7f1922a1c12d4b4ccf659c7e2f731c1ad2fb42c91410f17fbb6a3e4d779bc
|
||||
SHA512 (capnproto-c++-1.0.1.tar.gz) = c60291f433eea15a51e480e1679a4b9b3b5e67edebc445e371a7a32fce6ec5a7e4b440b17b2adc0565519ec369e3dae8ea727ae790a082a53ecd0d245b5275a9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user