From e4e773f2b90e7278ba929d92c6341db53fd70dd5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 11 Nov 2023 12:42:02 +0100 Subject: [PATCH] Update to version 0.26.0; Fixes RHBZ#2234876 --- .gitignore | 1 + rust-cbindgen.spec | 17 ++++++----------- rust2rpm.conf | 5 ----- rust2rpm.toml | 7 +++++++ sources | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 0028316..3ada0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /cbindgen-0.20.0.crate /cbindgen-0.24.3.crate /cbindgen-0.24.5.crate +/cbindgen-0.26.0.crate diff --git a/rust-cbindgen.spec b/rust-cbindgen.spec index be61961..67a0d2c 100644 --- a/rust-cbindgen.spec +++ b/rust-cbindgen.spec @@ -1,15 +1,10 @@ -# Generated by rust2rpm 24 -# * tests are completely broken with Cython 3.0.0 on Fedora 39+ -%if 0%{?fedora} >= 39 -%bcond_with check -%else +# Generated by rust2rpm 25 %bcond_without check -%endif %global crate cbindgen Name: rust-cbindgen -Version: 0.24.5 +Version: 0.26.0 Release: %autorelease Summary: Tool for generating C bindings to Rust code @@ -17,7 +12,7 @@ License: MPL-2.0 URL: https://crates.io/crates/cbindgen Source: %{crates_source} -BuildRequires: rust-packaging >= 23 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A tool for generating C bindings to Rust code.} @@ -90,20 +85,20 @@ use the "clap" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires %cargo_generate_buildrequires %if %{with check} echo '/usr/bin/cython' -echo '/usr/bin/g++' echo '/usr/bin/gcc' +echo '/usr/bin/g++' %endif %build %cargo_build -%cargo_license_summary +%{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %install diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index d45adf4..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -testrequires = - /usr/bin/cython - /usr/bin/gcc - /usr/bin/g++ diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..7a10ce9 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,7 @@ +[requires] +test = [ + "/usr/bin/cython", + "/usr/bin/gcc", + "/usr/bin/g++", +] + diff --git a/sources b/sources index 6d66cd5..94db26b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cbindgen-0.24.5.crate) = 16eb2267f6f75599d8cc4adc05a1387b8b95e595427bfee852f1746402a9609520f364b0fd443ce780f44a61f5b4b3518f2b021a4ff08d1f160afcb0a3bccecb +SHA512 (cbindgen-0.26.0.crate) = 2de81f46c9c68c985241a349f13125876667d1460d3658ead8c4ee9788cd139c30dbc08bebddc172cf0bd4644f3f17c02cf66f2a3ef706c52366fdaf0f9d8059