diff --git a/cargo_config b/cargo_config deleted file mode 100644 index a476f35fe9f533cd68bfd854717a6989c09993ec..0000000000000000000000000000000000000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" \ No newline at end of file diff --git a/rust-cbindgen.spec b/rust-cbindgen.spec index c9d7cf286e4a675de1c9e4961b1934e5746b17e6..580f21972afc22c9932753408facb4b71aeafc11 100644 --- a/rust-cbindgen.spec +++ b/rust-cbindgen.spec @@ -1,9 +1,8 @@ %global crate_name cbindgen -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now Name: rust-cbindgen Version: 0.29.2 -Release: 1 +Release: 2 Summary: Tool for generating C bindings to Rust code License: MPL-2.0 URL: https://crates.io/crates/cbindgen @@ -11,7 +10,6 @@ Source0: https://github.com/mozilla/%{crate_name}/archive/refs/tags/v%{ve # Generated locally by running 'cargo vendor' # then compress the vendor directory w/ 'Cargo.lock' Source1: vendor.tar.xz -Source2: cargo_config BuildRequires: cargo >= 1.64.0 BuildRequires: rust >= 1.64.0 BuildRequires: rust-packaging @@ -23,15 +21,12 @@ Tool for generating C bindings to Rust code. %prep %setup -q -T -b 0 -n %{crate_name}-%{version} %setup -q -D -T -a 1 -n %{crate_name}-%{version} -mkdir .cargo -cp %{SOURCE2} .cargo/config.toml +%cargo_prep %build -export RUSTFLAGS="%{rustflags} %{?build_rustflags}" %cargo_build %install -export RUSTFLAGS="%{rustflags} %{?build_rustflags}" export CARGO_HOME=`pwd`/cargo-home/ %define __cargo_is_lib 0 # cargo install appends /bin to the path @@ -45,6 +40,9 @@ rm -f %{buildroot}%{_prefix}/.crates2.json %{_bindir}/cbindgen %changelog +* Sat Nov 29 2025 Funda Wang - 0.29.2-2 +- fix build with newer cargo-rpm-macros + * Wed Oct 22 2025 Funda Wang - 0.29.2-1 - update to 0.29.2