From 86f1ff0de266979c0066208db0a6c5957e3dc05b Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 18 Jan 2024 12:39:36 -0600 Subject: [PATCH] Update to 2.20.3 - Convert to rust2rpm.toml Signed-off-by: Michel Lind --- .gitignore | 1 + dua-cli-fix-metadata.diff | 11 ----------- rust-dua-cli.spec | 16 ++++++---------- rust2rpm.conf | 2 -- rust2rpm.toml | 6 ++++++ sources | 2 +- 6 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 dua-cli-fix-metadata.diff delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index abf3b03..ef2f8de 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /dua-cli-2.17.0.crate /dua-cli-2.17.8.crate /dua-cli-2.20.1.crate +/dua-cli-2.20.3.crate diff --git a/dua-cli-fix-metadata.diff b/dua-cli-fix-metadata.diff deleted file mode 100644 index 678d6a0..0000000 --- a/dua-cli-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- dua-cli-2.20.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ dua-cli-2.20.1/Cargo.toml 2023-07-21T18:29:52.618671+00:00 -@@ -75,7 +75,7 @@ - version = "1.10.0" - - [dependencies.open] --version = "3.0" -+version = "4.0" - optional = true - - [dependencies.owo-colors] diff --git a/rust-dua-cli.spec b/rust-dua-cli.spec index 141e476..5262f09 100644 --- a/rust-dua-cli.spec +++ b/rust-dua-cli.spec @@ -1,22 +1,19 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 # * neither test files nor test code is included in published crates %bcond_with check %global crate dua-cli Name: rust-dua-cli -Version: 2.20.1 +Version: 2.20.3 Release: %autorelease Summary: Tool to conveniently learn about the disk usage of directories License: MIT URL: https://crates.io/crates/dua-cli Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * bump open dependency from 3.0 to 4.0 -Patch: dua-cli-fix-metadata.diff -BuildRequires: rust-packaging >= 23 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A tool to conveniently learn about the disk usage of directories, fast!.} @@ -26,12 +23,11 @@ A tool to conveniently learn about the disk usage of directories, fast!.} %package -n %{crate} Summary: %{summary} # Apache-2.0 OR MIT -# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT # MIT # MIT OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib # Zlib OR Apache-2.0 OR MIT -License: MIT AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) +License: MIT AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -191,7 +187,7 @@ use the "unicode-segmentation" 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 @@ -199,7 +195,7 @@ use the "unicode-segmentation" feature of the "%{crate}" crate. %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 6700165..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,2 +0,0 @@ -[DEFAULT] -summary = Tool to conveniently learn about the disk usage of directories diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..2b3f040 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,6 @@ +[package] +summary = "Tool to conveniently learn about the disk usage of directories" + +[tests] +comments = ["neither test files nor test code is included in published crates"] +run = ["none"] diff --git a/sources b/sources index 49efc80..b5e3e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dua-cli-2.20.1.crate) = a1d0c292f0a638cb3e258a61eff0c3fb5bbe4110ef6da24bcbd021e70c10b4e1f310f5920f0addd92b9a2d86d390083363b0ab5884848a7bd8de8534530acc33 +SHA512 (dua-cli-2.20.3.crate) = 78adcf0cf58053f9d1fe417dc2c99003c180ea12349d08b5f09f6203213e23c44800f2123689252d2378fe71e8a43a27c8a3a8d28c7e3953131090f53a09d546