From b56caffc7d94f7a4ba6e04390096444a58c14a4b Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 20 Aug 2024 22:00:38 -0700 Subject: [PATCH] fix: bandwhich (#1955) (#1984) (cherry picked from commit 97d5347c6eb4ace835063f7d87ea024c77267be6) Co-authored-by: madomado --- .../bandwhich-fix-metadata-auto.diff | 31 +++++++++---------- anda/langs/rust/bandwhich/rust-bandwhich.spec | 14 +++++---- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff b/anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff index 51d858cc01..7b4ffc6ad7 100644 --- a/anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff +++ b/anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff @@ -1,23 +1,20 @@ ---- bandwhich-0.22.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bandwhich-0.22.2/Cargo.toml 2024-02-02T05:59:38.855816+00:00 -@@ -149,20 +149,6 @@ - version = "0.25.0" - features = ["derive"] - --[target."cfg(any(target_os = \"macos\", target_os = \"freebsd\"))".dependencies.regex] --version = "1.10.3" -- - [target."cfg(target_os = \"linux\")".dependencies.procfs] +--- bandwhich-0.23.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ bandwhich-0.23.0/Cargo.toml 2024-08-18T04:14:50.797745+00:00 +@@ -165,17 +165,3 @@ + [target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies.procfs] version = "0.16.0" --[target."cfg(target_os = \"windows\")".dependencies.netstat2] +-[target.'cfg(any(target_os = "macos", target_os = "freebsd"))'.dependencies.regex] +-version = "1.10.5" +- +-[target.'cfg(target_os = "windows")'.dependencies.netstat2] -version = "0.9.1" - --[target."cfg(target_os = \"windows\")".dependencies.sysinfo] --version = "0.30.5" +-[target.'cfg(target_os = "windows")'.dependencies.sysinfo] +-version = "0.31.0" - --[target."cfg(target_os = \"windows\")".build-dependencies.http_req] --version = "0.10.2" +-[target.'cfg(target_os = "windows")'.build-dependencies.http_req] +-version = "0.11.1" - --[target."cfg(target_os = \"windows\")".build-dependencies.zip] --version = "0.6.6" +-[target.'cfg(target_os = "windows")'.build-dependencies.zip] +-version = "2.1.6" diff --git a/anda/langs/rust/bandwhich/rust-bandwhich.spec b/anda/langs/rust/bandwhich/rust-bandwhich.spec index a64d8b5c76..1e9ebbbaff 100644 --- a/anda/langs/rust/bandwhich/rust-bandwhich.spec +++ b/anda/langs/rust/bandwhich/rust-bandwhich.spec @@ -1,5 +1,6 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 #bcond_without check +%bcond_without mold %global crate bandwhich @@ -14,7 +15,7 @@ Source: %{crates_source} # Automatically generated patch to strip dependencies and normalize metadata Patch: bandwhich-fix-metadata-auto.diff -BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros mold cargo-rpm-macros >= 24 %global _description %{expand: Display current network utilization by process, connection and remote @@ -30,10 +31,11 @@ License: MIT %files -n %{crate} %license LICENSE.md -#license LICENSE.dependencies +%license LICENSE.dependencies %doc CHANGELOG.md %doc CODE_OF_CONDUCT.md %doc CONTRIBUTING.md +%doc INSTALL.md %doc README.md %{_bindir}/bandwhich @@ -42,9 +44,9 @@ License: MIT %cargo_prep_online %build -%cargo_build -#{cargo_license_summary} -#{cargo_license} > LICENSE.dependencies +#cargo_build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies %install %cargo_install