From 348f12ddbb710c721c4fca82f9a3bae2413b1bc9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 18 Oct 2023 23:57:50 +0200 Subject: [PATCH] Update to version 0.18.1; Fixes RHBZ#2238338 --- .gitignore | 1 + rust-cargo_metadata.spec | 22 +++++++++++++++++----- rust2rpm.conf | 2 -- rust2rpm.toml | 12 ++++++++++++ sources | 2 +- 5 files changed, 31 insertions(+), 8 deletions(-) delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 7c2c235..fbeda67 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cargo_metadata-0.15.3.crate /cargo_metadata-0.15.4.crate /cargo_metadata-0.17.0.crate +/cargo_metadata-0.18.1.crate diff --git a/rust-cargo_metadata.spec b/rust-cargo_metadata.spec index 32cd87c..eba9211 100644 --- a/rust-cargo_metadata.spec +++ b/rust-cargo_metadata.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate cargo_metadata Name: rust-cargo_metadata -Version: 0.17.0 +Version: 0.18.1 Release: %autorelease Summary: Structured access to the output of cargo metadata @@ -13,7 +13,7 @@ License: MIT URL: https://crates.io/crates/cargo_metadata Source: %{crates_source} -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Structured access to the output of `cargo metadata`.} @@ -71,8 +71,20 @@ use the "derive_builder" feature of the "%{crate}" crate. %files -n %{name}+derive_builder-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+unstable-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-devel +%ghost %{crate_instdir}/Cargo.toml + %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -86,7 +98,7 @@ use the "derive_builder" feature of the "%{crate}" crate. %if %{with check} %check -# * skip tests that depend on fixtures which are not included in published crates +# * skip tests that depend on data which is not included in published crates %cargo_test -a -- -- --skip advanced_feature_configuration --skip all_the_fields --skip basic_workspace_root_package_exists --skip current_dir %endif diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index f626714..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -all-features = true diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..29fc086 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,12 @@ +[features] +enable-all = true + +[tests] +skip = [ + "advanced_feature_configuration", + "all_the_fields", + "basic_workspace_root_package_exists", + "current_dir", +] +comments = ["skip tests that depend on data which is not included in published crates"] + diff --git a/sources b/sources index 55aec17..8368ea9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cargo_metadata-0.17.0.crate) = 2228ae25231fe752b1f61787464cb6a7219dc517f54097a800166b4778cbc5d514260dda5f79af51d303064c49a74ba799e20f4bf46c66210ead60253e62c4c7 +SHA512 (cargo_metadata-0.18.1.crate) = 43f87d2b84597ec9a27e9fccf06ec5f2630a0147a9c85779622c25493bd61268c266643f8206a17d76a16329af85f0cc563a9af7e17ca77024c0eaf788555f7d