diff --git a/cbindgen-fix-metadata.diff b/cbindgen-fix-metadata.diff index 9123689..8e4c870 100644 --- a/cbindgen-fix-metadata.diff +++ b/cbindgen-fix-metadata.diff @@ -1,15 +1,32 @@ --- cbindgen-0.26.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ cbindgen-0.26.0/Cargo.toml 2024-10-09T17:58:26.638747+00:00 -@@ -50,7 +50,7 @@ - optional = true ++++ cbindgen-0.26.0/Cargo.toml 2024-10-09T19:33:13.198852+00:00 +@@ -34,23 +34,14 @@ + ] + license = "MPL-2.0" + repository = "https://github.com/mozilla/cbindgen" ++autobins = false + [lib] + name = "cbindgen" + path = "src/lib.rs" + +-[[bin]] +-name = "cbindgen" +-path = "src/main.rs" +-doc = false +-required-features = ["clap"] +- +-[dependencies.clap] +-version = "3.1" +-optional = true +- [dependencies.heck] -version = "0.4" +version = "0.5" [dependencies.indexmap] version = "1" -@@ -91,7 +91,7 @@ +@@ -91,7 +82,7 @@ version = "0.5" [dev-dependencies.serial_test] @@ -17,4 +34,5 @@ +version = "3.1" [features] - default = ["clap"] +-default = ["clap"] ++default = [] diff --git a/rust-cbindgen0.26.spec b/rust-cbindgen0.26.spec index 3a2dae2..7106468 100644 --- a/rust-cbindgen0.26.spec +++ b/rust-cbindgen0.26.spec @@ -1,5 +1,6 @@ # Generated by rust2rpm 26 -%bcond_without check +# * tests require the cbindgen executable +%bcond_with check %global debug_package %{nil} # prevent executables from being installed @@ -16,6 +17,7 @@ License: MPL-2.0 URL: https://crates.io/crates/cbindgen Source: %{crates_source} # Manually created patch for downstream crate metadata changes +# * drop cbindgen executable from the compat package # * bump heck dependency from 0.4 to 0.5 # * bump serial_test dev-dependency from 0.5 to 3.1 Patch: cbindgen-fix-metadata.diff @@ -61,18 +63,6 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+clap-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+clap-devel %{_description} - -This package contains library source intended for building other packages which -use the "clap" feature of the "%{crate}" crate. - -%files -n %{name}+clap-devel -%ghost %{crate_instdir}/Cargo.toml - %prep %autosetup -n %{crate}-%{version} -p1 %cargo_prep diff --git a/rust2rpm.toml b/rust2rpm.toml index eed282c..a90ac2d 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,6 +1,7 @@ [package] cargo-install-bin = false cargo-toml-patch-comments = [ + "drop cbindgen executable from the compat package", "bump heck dependency from 0.4 to 0.5", "bump serial_test dev-dependency from 0.5 to 3.1", ] @@ -12,3 +13,7 @@ test = [ "/usr/bin/g++", ] +[tests] +run = ["none"] +comments = ["tests require the cbindgen executable"] +