Update to version 2.17.8; Fixes RHBZ#2066020

.gitignore

@@ -13,3 +13,4 @@
 /dua-cli-2.10.9.crate
 /dua-cli-2.11.1.crate
 /dua-cli-2.17.0.crate
+/dua-cli-2.17.8.crate

LICENSE.dependencies

@@ -0,0 +1,75 @@
+ASL 2.0 or MIT: rust-autocfg 1.1.0
+ASL 2.0 or MIT: rust-indexmap 1.9.1
+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-signal-hook 0.3.14
+ASL 2.0 or MIT: rust-signal-hook-mio 0.2.3
+ASL 2.0 or MIT: rust-signal-hook-registry 1.4.0
+ASL 2.0 or MIT: rust-wild 2.0.4
+BSD: rust-instant 0.1.12
+MIT or ASL 2.0 or zlib: rust-tinyvec_macros 0.1.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-cassowary 0.3.0
+MIT or ASL 2.0: rust-cfg-if 1.0.0
+MIT OR ASL 2.0: rust-clap 3.2.12
+MIT or ASL 2.0: rust-clap_derive 3.2.7
+MIT or ASL 2.0: rust-clap_lex 0.2.4
+MIT or ASL 2.0: rust-crossbeam 0.8.1
+MIT or ASL 2.0: rust-crossbeam-channel 0.5.5
+MIT or ASL 2.0: rust-crossbeam-deque 0.8.1
+MIT or ASL 2.0: rust-crossbeam-epoch 0.9.9
+MIT or ASL 2.0: rust-crossbeam-queue 0.3.5
+MIT or ASL 2.0: rust-crossbeam-utils 0.8.10
+MIT or ASL 2.0: rust-either 1.7.0
+MIT or ASL 2.0: rust-fixedbitset 0.4.2
+MIT or ASL 2.0: rust-form_urlencoded 1.0.1
+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-idna 0.2.3
+MIT or ASL 2.0: rust-itertools 0.10.3
+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_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-pathdiff 0.2.1
+MIT or ASL 2.0: rust-percent-encoding 2.1.0
+MIT or ASL 2.0: rust-petgraph 0.6.2
+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-rayon 1.5.3
+MIT or ASL 2.0: rust-rayon-core 1.9.3
+MIT or ASL 2.0: rust-scopeguard 1.1.0
+MIT or ASL 2.0: rust-smallvec 1.9.0
+MIT or ASL 2.0: rust-syn 1.0.98
+MIT or ASL 2.0: rust-unicode-bidi 0.3.8
+MIT or ASL 2.0: rust-unicode-ident 1.0.1
+MIT or ASL 2.0: rust-unicode-normalization 0.1.21
+MIT or ASL 2.0: rust-unicode-segmentation 1.9.0
+MIT or ASL 2.0: rust-unicode-width 0.1.9
+MIT or ASL 2.0: rust-url 2.2.2
+MIT or ASL 2.0: rust-version_check 0.9.4
+MIT: rust-atty 0.2.14
+MIT: rust-byte-unit 4.0.14
+MIT: rust-crossterm 0.22.1
+MIT: rust-crosstermion 0.9.0
+MIT: rust-filesize 0.2.0
+MIT: rust-jwalk 0.6.0
+MIT: rust-matches 0.1.9
+MIT: rust-memoffset 0.6.5
+MIT: rust-mio0.7 0.7.14
+MIT: rust-open 3.0.2
+MIT: rust-strsim 0.10.0
+MIT: rust-textwrap 0.15.0
+MIT: rust-trash 2.1.5
+MIT: rust-tui 0.17.0
+MIT: rust-tui-react 0.17.0
+MIT: rust-utf8-width 0.1.6
+MPLv2.0: rust-colored 2.0.0
+Unlicense or MIT: rust-termcolor 1.1.3
+zlib or ASL 2.0 or MIT: rust-tinyvec 1.6.0

dua-cli-fix-metadata.diff

@@ -1,49 +1,10 @@
---- dua-cli-2.17.0/Cargo.toml	1970-01-01T00:00:01+00:00
+--- dua-cli-2.17.8/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ dua-cli-2.17.0/Cargo.toml	2022-02-13T15:57:31.687625+00:00
++++ dua-cli-2.17.8/Cargo.toml	2022-07-22T11:35:32.851196+00:00
-@@ -45,14 +45,14 @@
+@@ -129,7 +129,3 @@
- version = "4"
+     "crosstermion/tui-react-termion",
- 
+     "tui-shared",
- [dependencies.clap]
+ ]
--version = "=3.0.0-rc.8"
+-
-+version = "3.0.0"
- features = ["derive", "cargo"]
- 
- [dependencies.colored]
- version = "2.0.0"
- 
- [dependencies.crosstermion]
--version = "0.8.1"
-+version = "0.9"
- optional = true
- default-features = false
- 
-@@ -73,19 +73,19 @@
- optional = true
- 
- [dependencies.petgraph]
--version = "0.6"
-+version = "0.5.1"
- 
- [dependencies.trash]
- version = "2.0.1"
- optional = true
- 
- [dependencies.tui]
--version = "0.16.0"
-+version = "0.17.0"
- optional = true
- default-features = false
- 
- [dependencies.tui-react]
--version = "0.16.0"
-+version = "0.17.0"
- optional = true
- 
- [dependencies.unicode-segmentation]
-@@ -104,6 +104,3 @@
- tui-crossplatform = ["crosstermion/tui-react-crossterm", "tui-shared"]
- tui-shared = ["tui", "tui-react", "open", "unicode-segmentation"]
- tui-unix = ["crosstermion/tui-react-termion", "tui-shared"]
 -[target."cfg(all(target_os = \"macos\", target_arch = \"aarch64\"))".dependencies.sysinfo]
--version = "0.22.3"
+-version = "0.23.2"
 -default-features = false

rust-dua-cli.spec

@@ -1,30 +1,26 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
 # * neither test files nor test code is included in published crates
 %bcond_with check
 
 %global crate dua-cli
 
 Name:           rust-%{crate}
-Version:        2.17.0
+Version:        2.17.8
 Release:        %autorelease
 Summary:        Tool to conveniently learn about the disk usage of directories
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/dua-cli
-Source:         %{crates_source}
+Source0:        %{crates_source}
+Source1:        LICENSE.dependencies
 # Initial patched metadata
-# * bump to clap 3.0.0
-# * bump crosstermion from 0.8.1 to 0.9
-# * bump tui from 0.16.0 to 0.17.0
-# * bump tui-react from 0.16.0 to 0.17.0
-# * temporarily downgrade petgraph from 0.6.0 to 0.5.1
 # * drop macos-specific dependencies
 Patch0:         dua-cli-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Tool to conveniently learn about the disk usage of directories, fast!.}
@@ -42,12 +38,15 @@ Summary:        %{summary}
 # Unlicense or MIT
 # zlib or ASL 2.0 or MIT
 License:        MIT and BSD and MPLv2.0
+# LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
-%doc CHANGELOG.md README.md
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc README.md
 %{_bindir}/dua
 
 %package        devel
@@ -60,9 +59,10 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE
+%license %{crate_instdir}/LICENSE
-%doc CHANGELOG.md README.md
+%doc %{crate_instdir}/CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -74,19 +74,7 @@ This package contains library source intended for building other packages which
 use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+aggregate-scan-progress-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+aggregate-scan-progress-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "aggregate-scan-progress" feature of the "%{crate}" crate.
-
-%files       -n %{name}+aggregate-scan-progress-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %package     -n %{name}+crosstermion-devel
 Summary:        %{summary}
@@ -98,7 +86,7 @@ This package contains library source intended for building other packages which
 use the "crosstermion" feature of the "%{crate}" crate.
 
 %files       -n %{name}+crosstermion-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+open-devel
 Summary:        %{summary}
@@ -110,7 +98,7 @@ This package contains library source intended for building other packages which
 use the "open" feature of the "%{crate}" crate.
 
 %files       -n %{name}+open-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+trash-devel
 Summary:        %{summary}
@@ -122,7 +110,7 @@ This package contains library source intended for building other packages which
 use the "trash" feature of the "%{crate}" crate.
 
 %files       -n %{name}+trash-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+trash-move-devel
 Summary:        %{summary}
@@ -134,7 +122,7 @@ This package contains library source intended for building other packages which
 use the "trash-move" feature of the "%{crate}" crate.
 
 %files       -n %{name}+trash-move-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+tui-devel
 Summary:        %{summary}
@@ -146,7 +134,7 @@ This package contains library source intended for building other packages which
 use the "tui" feature of the "%{crate}" crate.
 
 %files       -n %{name}+tui-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+tui-crossplatform-devel
 Summary:        %{summary}
@@ -158,7 +146,7 @@ This package contains library source intended for building other packages which
 use the "tui-crossplatform" feature of the "%{crate}" crate.
 
 %files       -n %{name}+tui-crossplatform-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+tui-react-devel
 Summary:        %{summary}
@@ -170,7 +158,7 @@ This package contains library source intended for building other packages which
 use the "tui-react" feature of the "%{crate}" crate.
 
 %files       -n %{name}+tui-react-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+tui-shared-devel
 Summary:        %{summary}
@@ -182,7 +170,7 @@ This package contains library source intended for building other packages which
 use the "tui-shared" feature of the "%{crate}" crate.
 
 %files       -n %{name}+tui-shared-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+tui-unix-devel
 Summary:        %{summary}
@@ -194,7 +182,7 @@ This package contains library source intended for building other packages which
 use the "tui-unix" feature of the "%{crate}" crate.
 
 %files       -n %{name}+tui-unix-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+unicode-segmentation-devel
 Summary:        %{summary}
@@ -206,10 +194,11 @@ This package contains library source intended for building other packages which
 use the "unicode-segmentation" feature of the "%{crate}" crate.
 
 %files       -n %{name}+unicode-segmentation-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+cp %{SOURCE1} .
 %cargo_prep
 
 %generate_buildrequires

sources

@@ -1 +1 @@
-SHA512 (dua-cli-2.17.0.crate) = 8c24449c57ac4d4664a8839287bd58154df510c1cdf133cace9d013da63c6b64e88afa3c99d9f922e092583a7267cf348ba4c0b61097075f14cbd71593391102
+SHA512 (dua-cli-2.17.8.crate) = 5bf3c0445f6c351cdd242b2e62665660624941b409f1d8c68fc7c658e4d68c554753b31707644762108cb3eeecd8b15af11b953cd035671768bf7fe456f0fbf5