Update to version 0.14.0; Fixes RHBZ#2112181

2 years ago · 876e50b98e
parent 225a1e7b35
commit 876e50b98e
7 changed files with 33 additions and 129 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@
 /procs-0.10.5.crate
 /procs-0.10.10.crate
 /procs-0.12.3.crate
+/procs-0.14.0.crate
--- a/LICENSE.dependencies
+++ b/LICENSE.dependencies
@ -1,99 +0,0 @@
-0BSD or MIT or ASL 2.0: rust-adler 1.0.2
-ASL 2.0 or MIT: rust-async-channel 1.6.1
-ASL 2.0 or MIT: rust-async-executor 1.4.1
-ASL 2.0 or MIT: rust-async-global-executor 2.2.0
-ASL 2.0 or MIT: rust-async-io 1.7.0
-ASL 2.0 or MIT: rust-async-lock 2.5.0
-ASL 2.0 or MIT: rust-async-std 1.12.0
-ASL 2.0 or MIT: rust-async-task 4.3.0
-ASL 2.0 or MIT: rust-atomic-waker 1.0.0
-ASL 2.0 or MIT: rust-autocfg 1.1.0
-ASL 2.0 or MIT: rust-blocking 1.2.0
-ASL 2.0 or MIT: rust-cache-padded 1.2.0
-ASL 2.0 or MIT: rust-concurrent-queue 1.2.3
-ASL 2.0 or MIT: rust-ctor 0.1.22
-ASL 2.0 or MIT: rust-event-listener 2.5.2
-ASL 2.0 or MIT: rust-fastrand 1.7.0
-ASL 2.0 or MIT: rust-futures-lite 1.12.0
-ASL 2.0 or MIT: rust-indexmap 1.9.1
-ASL 2.0 or MIT: rust-pager 0.16.0
-ASL 2.0 or MIT: rust-parking 2.0.0
-ASL 2.0 or MIT: rust-parking_lot0.11 0.11.2
-ASL 2.0 or MIT: rust-parking_lot_core0.8 0.8.5
-ASL 2.0 or MIT: rust-pin-project-lite 0.2.9
-ASL 2.0 or MIT: rust-polling 2.2.0
-ASL 2.0 or MIT: rust-signal-hook-registry 1.4.0
-ASL 2.0 or MIT: rust-signal-hook0.1 0.1.17
-ASL 2.0 or MIT: rust-value-bag 1.0.0~alpha.9
-ASL 2.0 or MIT: rust-waker-fn 1.1.0
-Apache-2.0: rust-getch 0.3.1
-BSD: rust-instant 0.1.12
-MIT OR Apache-2.0: rust-clap 3.2.12
-MIT OR Apache-2.0: rust-clap_complete 3.2.3
-MIT OR Apache-2.0: rust-clap_derive 3.2.7
-MIT OR Apache-2.0: rust-clap_lex 0.2.4
-MIT OR Apache-2.0: rust-procfs 0.12.0
-MIT or ASL 2.0: rust-anyhow 1.0.58
-MIT or ASL 2.0: rust-bitflags 1.3.2
-MIT or ASL 2.0: rust-cfg-if 1.0.0
-MIT or ASL 2.0: rust-chrono 0.4.19
-MIT or ASL 2.0: rust-crc32fast 1.3.2
-MIT or ASL 2.0: rust-crossbeam-utils 0.8.10
-MIT or ASL 2.0: rust-directories 4.0.1
-MIT or ASL 2.0: rust-dirs-sys 0.3.7
-MIT or ASL 2.0: rust-either 1.7.0
-MIT or ASL 2.0: rust-errno 0.2.8
-MIT or ASL 2.0: rust-flate2 1.0.22
-MIT or ASL 2.0: rust-futures-core 0.3.21
-MIT or ASL 2.0: rust-futures-io 0.3.21
-MIT or ASL 2.0: rust-hashbrown 0.12.3
-MIT or ASL 2.0: rust-heck 0.4.0
-MIT or ASL 2.0: rust-hex 0.4.3
-MIT or ASL 2.0: rust-kv-log-macro 1.0.7
-MIT or ASL 2.0: rust-lazy_static 1.4.0
-MIT or ASL 2.0: rust-libc 0.2.126
-MIT or ASL 2.0: rust-lock_api 0.4.7
-MIT or ASL 2.0: rust-log 0.4.17
-MIT or ASL 2.0: rust-num-integer 0.1.45
-MIT or ASL 2.0: rust-num-traits 0.2.15
-MIT or ASL 2.0: rust-num_cpus 1.13.1
-MIT or ASL 2.0: rust-once_cell 1.13.0
-MIT or ASL 2.0: rust-os_str_bytes 6.1.0
-MIT or ASL 2.0: rust-pin-utils 0.1.0
-MIT or ASL 2.0: rust-proc-macro-error 1.0.4
-MIT or ASL 2.0: rust-proc-macro-error-attr 1.0.4
-MIT or ASL 2.0: rust-proc-macro2 1.0.40
-MIT or ASL 2.0: rust-quote 1.0.20
-MIT or ASL 2.0: rust-regex 1.6.0
-MIT or ASL 2.0: rust-regex-syntax 0.6.27
-MIT or ASL 2.0: rust-scopeguard 1.1.0
-MIT or ASL 2.0: rust-serde 1.0.139
-MIT or ASL 2.0: rust-serde_derive 1.0.139
-MIT or ASL 2.0: rust-smallvec 1.9.0
-MIT or ASL 2.0: rust-socket2 0.4.4
-MIT or ASL 2.0: rust-syn 1.0.98
-MIT or ASL 2.0: rust-termbg 0.4.1
-MIT or ASL 2.0: rust-terminal_size 0.1.17
-MIT or ASL 2.0: rust-thiserror 1.0.31
-MIT or ASL 2.0: rust-thiserror-impl 1.0.31
-MIT or ASL 2.0: rust-time0.1 0.1.44
-MIT or ASL 2.0: rust-toml 0.5.9
-MIT or ASL 2.0: rust-unicode-ident 1.0.1
-MIT or ASL 2.0: rust-unicode-width 0.1.9
-MIT or ASL 2.0: rust-version_check 0.9.4
-MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4
-MIT: rust-atty 0.2.14
-MIT: rust-byte-unit 4.0.14
-MIT: rust-console 0.15.0
-MIT: rust-crossterm0.19 0.19.0
-MIT: rust-mio0.7 0.7.14
-MIT: rust-slab 0.4.7
-MIT: rust-strsim 0.10.0
-MIT: rust-termios 0.3.3
-MIT: rust-textwrap 0.15.0
-MIT: rust-users 0.11.0
-MIT: rust-utf8-width 0.1.6
-MIT: rust-which 4.2.5
-Unlicense or MIT: rust-byteorder 1.4.3
-Unlicense or MIT: rust-memchr 2.5.0
-Unlicense or MIT: rust-termcolor 1.1.3
--- a/README.md
+++ b/README.md
@ -1,3 +0,0 @@
-# rust-procs
-
-The rust-procs package
--- a/procs-fix-metadata-auto.diff
+++ b/procs-fix-metadata-auto.diff
@ -1,6 +1,6 @@
--- procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
-@@ -146,33 +146,6 @@
+--- 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 @@
 [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.which]
 version = "4"
 
@ -8,7 +8,11 @@
 -version = "0.2"
 -
 -[target."cfg(target_os = \"macos\")".dependencies.libproc]
-version = "0.12"
+-version = "0.13"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.nix]
+-version = "0.26.2"
+-features = ["process"]
 -
 -[target."cfg(target_os = \"macos\")".dependencies.pager]
 -version = "0.16"
@ -29,6 +33,7 @@
 -    "tlhelp32",
 -    "winbase",
 -    "winnt",
+-    "iphlpapi",
 -]
 -
 [badges.codecov]
--- a/procs-fix-metadata.diff
+++ b/procs-fix-metadata.diff
@ -1,17 +1,17 @@
--- procs-0.12.3/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ procs-0.12.3/Cargo.toml	2022-07-27T11:22:26.812654+00:00
+--- 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
@@ -102,10 +102,6 @@
 [dependencies.directories]
 version = "4.0.1"
 
 -[dependencies.dockworker]
-version = "0.0.23"
+-version = "0.1.2"
 -optional = true
 -
 [dependencies.getch]
 version = "0.3.1"
 
-@@ -131,8 +127,7 @@
+@@ -138,8 +134,7 @@
 version = "0.1"
 
 [features]
@ -20,4 +20,4 @@
 +default = []
 
 [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.pager]
- version = "0.16"
+ version = "0.16.1"
--- a/rust-procs.spec
+++ b/rust-procs.spec
@ -1,43 +1,42 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 24
 %bcond_without check

 %global crate procs

 Name:           rust-procs
-Version:        0.12.3
+Version:        0.14.0
 Release:        %autorelease
 Summary:        Modern replacement for ps

 License:        MIT
 URL:            https://crates.io/crates/procs
-Source0:        %{crates_source}
-Source1:        LICENSE.dependencies
+Source:         %{crates_source}
 # Automatically generated patch to strip foreign dependencies
 Patch:          procs-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * remove docker feature / dockworker dependency
 Patch:          procs-fix-metadata.diff

-ExclusiveArch:  %{rust_arches}
-
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  rust-packaging >= 23

 %global _description %{expand:
-Modern replacement for ps.}
+A modern replacement for ps.}

 %description %{_description}

 %package     -n %{crate}
 Summary:        %{summary}
-# 0BSD or MIT or ASL 2.0
-# ASL 2.0 or MIT
-# ASL 2.0
-# BSD
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD OR MIT OR Apache-2.0
+# Apache-2.0
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-3-Clause
 # MIT
-# MIT or ASL 2.0
-# MIT or zlib or ASL 2.0
-# Unlicense or MIT
-License:        MIT and ASL 2.0 and BSD
+# MIT OR Apache-2.0
+# MIT OR Zlib OR Apache-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.dependencies contains a full license breakdown

 %description -n %{crate} %{_description}
@ -51,7 +50,6 @@ License:        MIT and ASL 2.0 and BSD

 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
-cp %{SOURCE1} .
 %cargo_prep

 %generate_buildrequires
@ -59,6 +57,8 @@ cp %{SOURCE1} .

 %build
 %cargo_build
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies

 %install
 %cargo_install
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (procs-0.12.3.crate) = fe5c476c4f0d2fc1c86e2c3beb740db20330579ea34521866766d2b87e8188f5f65ffb944f3598413da58bc06ec0804c557b28e5c14ce0f2982681f06cc893e4
+SHA512 (procs-0.14.0.crate) = 8941b7fe6a6a1ce3ae0c771884c5516d907b4edc3f851238b9884adeb9a511de09b9720df468192f1d31c35fe592cce1afa4b64ed646989d97491a25c36054ac