From b697d4530a401828eed41c15197fe70a72420ee8 Mon Sep 17 00:00:00 2001 From: blinxen Date: Tue, 17 Sep 2024 23:27:41 +0200 Subject: [PATCH] Update to version 0.29.0 (rhbz#2300466) --- .gitignore | 1 + prodash-fix-metadata.diff | 13 ------------- rust-prodash.spec | 32 ++++++++++++++++---------------- rust2rpm.toml | 9 +++++++++ sources | 2 +- 5 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 prodash-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 0976d10..27251d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /prodash-25.0.1.crate /prodash-26.2.2.crate /prodash-28.0.0.crate +/prodash-29.0.0.crate diff --git a/prodash-fix-metadata.diff b/prodash-fix-metadata.diff deleted file mode 100644 index 9b6888b..0000000 --- a/prodash-fix-metadata.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- prodash-28.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ prodash-28.0.0/Cargo.toml 2024-04-05T16:08:52.699130+00:00 -@@ -162,10 +162,6 @@ - [dev-dependencies.blocking] - version = "1.0.0" - --[dev-dependencies.criterion] --version = "0.5.1" --default-features = false -- - [dev-dependencies.env_logger] - version = "0.10.0" - features = ["humantime"] diff --git a/rust-prodash.spec b/rust-prodash.spec index 5a31062..6b9f1a2 100644 --- a/rust-prodash.spec +++ b/rust-prodash.spec @@ -5,18 +5,16 @@ %global crate prodash Name: rust-prodash -Version: 28.0.0 +Version: 29.0.0 Release: %autorelease Summary: Dashboard for visualizing progress of asynchronous and possibly blocking tasks License: MIT URL: https://crates.io/crates/prodash Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * Drop benchmark dependency -Patch: prodash-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: tomcli %global _description %{expand: A dashboard for visualizing progress of asynchronous and possibly @@ -159,6 +157,18 @@ use the "is-terminal" feature of the "%{crate}" crate. %files -n %{name}+is-terminal-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+jiff-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+jiff-devel %{_description} + +This package contains library source intended for building other packages which +use the "jiff" feature of the "%{crate}" crate. + +%files -n %{name}+jiff-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+local-time-devel Summary: %{summary} BuildArch: noarch @@ -267,18 +277,6 @@ use the "signal-hook" feature of the "%{crate}" crate. %files -n %{name}+signal-hook-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+time-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+time-devel %{_description} - -This package contains library source intended for building other packages which -use the "time" feature of the "%{crate}" crate. - -%files -n %{name}+time-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+unicode-segmentation-devel Summary: %{summary} BuildArch: noarch @@ -329,6 +327,8 @@ use the "unit-human" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version} -p1 +# Drop benchmark dependency +tomcli-set Cargo.toml del 'dev-dependencies.criterion' %cargo_prep %generate_buildrequires diff --git a/rust2rpm.toml b/rust2rpm.toml index 3bedef4..6b52d7b 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -9,3 +9,12 @@ hide = [ "render-tui-crossterm", "unit-duration" ] + +[requires] +build = ["tomcli"] + +[scripts.prep] +pre = [ + "# Drop benchmark dependency", + "tomcli-set Cargo.toml del 'dev-dependencies.criterion'" +] diff --git a/sources b/sources index 7e5b62f..b6e8c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (prodash-28.0.0.crate) = 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70 +SHA512 (prodash-29.0.0.crate) = d7d625c4679864183da78c3c036f84805957db10f63c52480e9defca3bf4df23476e65dcfb5a9cffc46983db96a97a9dde7aca119ea0e6e9b1889770f7072705