From fbaae6aaa39060d09a15bf16d0a549ceb8063d53 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 10 Oct 2023 21:01:08 +0200 Subject: [PATCH] Update to version 0.14.1; Fixes RHBZ#2242470 --- .gitignore | 1 + procs-fix-metadata-auto.diff | 17 +++++++++++------ procs-fix-metadata.diff | 15 +++++++++------ rust-procs.spec | 13 +++++++------ sources | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 68fba76..dcf56ff 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /procs-0.10.10.crate /procs-0.12.3.crate /procs-0.14.0.crate +/procs-0.14.1.crate diff --git a/procs-fix-metadata-auto.diff b/procs-fix-metadata-auto.diff index b14b0f5..c447b4c 100644 --- a/procs-fix-metadata-auto.diff +++ b/procs-fix-metadata-auto.diff @@ -1,17 +1,17 @@ ---- procs-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ procs-0.14.0/Cargo.toml 2023-08-02T12:35:27.569881+00:00 -@@ -153,38 +153,6 @@ +--- procs-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ procs-0.14.1/Cargo.toml 2023-10-07T10:12:15.779397+00:00 +@@ -161,38 +161,6 @@ [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.which] version = "4" -[target."cfg(target_os = \"macos\")".dependencies.errno] --version = "0.2" +-version = "0.3" - -[target."cfg(target_os = \"macos\")".dependencies.libproc] --version = "0.13" +-version = "0.14" - -[target."cfg(target_os = \"macos\")".dependencies.nix] --version = "0.26.2" +-version = "0.27.1" -features = ["process"] - -[target."cfg(target_os = \"macos\")".dependencies.pager] @@ -39,3 +39,8 @@ [badges.codecov] branch = "master" repository = "dalance/procs" +@@ -200,3 +168,4 @@ + + [badges.travis-ci] + repository = "dalance/procs" ++ diff --git a/procs-fix-metadata.diff b/procs-fix-metadata.diff index c34dba8..d55ef5c 100644 --- a/procs-fix-metadata.diff +++ b/procs-fix-metadata.diff @@ -1,22 +1,25 @@ ---- procs-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ procs-0.14.0/Cargo.toml 2023-08-02T12:35:47.131968+00:00 +--- procs-0.14.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ procs-0.14.1/Cargo.toml 2023-10-07T10:12:32.536030+00:00 @@ -102,10 +102,6 @@ [dependencies.directories] - version = "4.0.1" + version = "5.0.1" -[dependencies.dockworker] --version = "0.1.2" +-version = "0.3.0" -optional = true - [dependencies.getch] version = "0.3.1" -@@ -138,8 +134,7 @@ +@@ -143,11 +139,7 @@ version = "0.1" [features] -default = ["docker"] --docker = ["dockworker"] +-docker = [ +- "dockworker", +- "tokio", +-] +default = [] [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.pager] diff --git a/rust-procs.spec b/rust-procs.spec index 2b3337c..56e0c69 100644 --- a/rust-procs.spec +++ b/rust-procs.spec @@ -1,17 +1,17 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global crate procs Name: rust-procs -Version: 0.14.0 +Version: 0.14.1 Release: %autorelease Summary: Modern replacement for ps License: MIT URL: https://crates.io/crates/procs Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: procs-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * remove docker feature / dockworker dependency @@ -35,8 +35,9 @@ Summary: %{summary} # MIT # MIT OR Apache-2.0 # MIT OR Zlib OR Apache-2.0 +# MPL-2.0 # Unlicense OR MIT -License: Apache-2.0 AND BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) +License: Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -49,7 +50,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (0B %{_bindir}/procs %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -57,7 +58,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (0B %build %cargo_build -%cargo_license_summary +%{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %install diff --git a/sources b/sources index 346cba2..05ff55a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (procs-0.14.0.crate) = 8941b7fe6a6a1ce3ae0c771884c5516d907b4edc3f851238b9884adeb9a511de09b9720df468192f1d31c35fe592cce1afa4b64ed646989d97491a25c36054ac +SHA512 (procs-0.14.1.crate) = d6c6abf9e5baf84a00c636598c17a4eb132888170a4c9ca67284c8ba0e1cc9a38b443e906d79106639c9abed0ca7532f1f6ab3100e5ad764726d20472fdce4c0