Update to version 0.13.0; Fixes RHBZ#2017604

.gitignore

@@ -6,3 +6,4 @@
 /git-delta-0.6.0.crate
 /git-delta-0.8.0.crate
 /git-delta-0.8.3.crate
+/git-delta-0.13.0.crate

LICENSE.dependencies

@@ -0,0 +1,164 @@
+0BSD or MIT or ASL 2.0: rust-adler 1.0.2
+ASL 2.0 or Boost: rust-ryu 1.0.10
+ASL 2.0 or MIT: rust-autocfg 1.1.0
+ASL 2.0 or MIT: rust-cexpr 0.6.0
+ASL 2.0 or MIT: rust-find-crate 0.6.3
+ASL 2.0 or MIT: rust-fnv 1.0.7
+ASL 2.0 or MIT: rust-indexmap 1.9.1
+ASL 2.0 or MIT: rust-peeking_take_while 0.1.2
+ASL 2.0 or MIT: rust-rustc-hash 1.1.0
+ASL 2.0 or MIT: rust-utf8parse 0.2.0
+ASL 2.0 or MIT: rust-vte 0.10.1
+ASL 2.0 or MIT: rust-vte_generate_state_changes 0.1.1
+ASL 2.0 or MIT: rust-wild 2.0.4
+ASL 2.0 or MIT: rust-xdg 2.4.1
+ASL 2.0: rust-approx 0.5.1
+ASL 2.0: rust-bytesize 1.1.0
+ASL 2.0: rust-clang-sys 1.3.3
+ASL 2.0: rust-line-wrap 0.1.1
+BSD: rust-bindgen 0.59.2
+BSD: rust-git-version 0.3.5
+BSD: rust-git-version-macro 0.3.5
+CC0: rust-encoding-index-japanese 1.20141219.5
+CC0: rust-encoding-index-korean 1.20141219.5
+CC0: rust-encoding-index-simpchinese 1.20141219.5
+CC0: rust-encoding-index-singlebyte 1.20141219.5
+CC0: rust-encoding-index-tradchinese 1.20141219.5
+LGPLv3+: rust-ansi_colours 1.1.1
+MIT OR Apache-2.0: rust-clap 3.2.12
+MIT OR Apache-2.0: rust-clap_derive 3.2.7
+MIT OR Apache-2.0: rust-clap_lex 0.2.4
+MIT and GPLv2 with exceptions and BSD: rust-libgit2-sys 0.13.4
+MIT or ASL 2.0 or zlib: rust-tinyvec_macros 0.1.0
+MIT or ASL 2.0: rust-arrayvec0.5 0.5.2
+MIT or ASL 2.0: rust-base64 0.13.0
+MIT or ASL 2.0: rust-bat 0.21.0
+MIT or ASL 2.0: rust-bitflags 1.3.2
+MIT or ASL 2.0: rust-bstr 0.2.17
+MIT or ASL 2.0: rust-bugreport 0.5.0
+MIT or ASL 2.0: rust-cc 1.0.73
+MIT or ASL 2.0: rust-cfg-if 1.0.0
+MIT or ASL 2.0: rust-cfg-if0.1 0.1.10
+MIT or ASL 2.0: rust-chrono 0.4.19
+MIT or ASL 2.0: rust-chrono-humanize 0.2.1
+MIT or ASL 2.0: rust-clircle 0.3.0
+MIT or ASL 2.0: rust-content_inspector 0.2.4
+MIT or ASL 2.0: rust-crc32fast 1.3.2
+MIT or ASL 2.0: rust-ctrlc 3.2.2
+MIT or ASL 2.0: rust-dirs 4.0.0
+MIT or ASL 2.0: rust-dirs-next 2.0.0
+MIT or ASL 2.0: rust-dirs-sys 0.3.7
+MIT or ASL 2.0: rust-dirs-sys-next 0.1.2
+MIT or ASL 2.0: rust-either 1.7.0
+MIT or ASL 2.0: rust-env_logger 0.9.0
+MIT or ASL 2.0: rust-error-chain 0.12.4
+MIT or ASL 2.0: rust-flate2 1.0.22
+MIT or ASL 2.0: rust-form_urlencoded 1.0.1
+MIT or ASL 2.0: rust-getrandom0.1 0.1.15
+MIT or ASL 2.0: rust-git2 0.14.4
+MIT or ASL 2.0: rust-glob 0.3.0
+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-humantime 2.1.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-itoa 1.0.2
+MIT or ASL 2.0: rust-jobserver 0.1.24
+MIT or ASL 2.0: rust-lazy_static 1.4.0
+MIT or ASL 2.0: rust-lazycell 1.3.0
+MIT or ASL 2.0: rust-libc 0.2.126
+MIT or ASL 2.0: rust-libgit2-sys 0.13.4
+MIT or ASL 2.0: rust-libz-sys 1.1.8
+MIT or ASL 2.0: rust-linked-hash-map 0.5.6
+MIT or ASL 2.0: rust-log 0.4.17
+MIT or ASL 2.0: rust-minimal-lexical 0.2.1
+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_threads 0.1.6
+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-palette 0.6.0
+MIT or ASL 2.0: rust-palette_derive 0.6.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-pkg-config 0.3.25
+MIT or ASL 2.0: rust-ppv-lite86 0.2.16
+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-macro-hack 0.5.19
+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-rand0.7 0.7.3
+MIT or ASL 2.0: rust-rand_chacha0.2 0.2.2
+MIT or ASL 2.0: rust-rand_core0.5 0.5.1
+MIT or ASL 2.0: rust-rand_pcg0.2 0.2.1
+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-safemem 0.3.3
+MIT or ASL 2.0: rust-semver 1.0.12
+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-serde_json 1.0.82
+MIT or ASL 2.0: rust-serde_yaml 0.8.25
+MIT or ASL 2.0: rust-shell-escape 0.1.5
+MIT or ASL 2.0: rust-shell-words 1.1.0
+MIT or ASL 2.0: rust-shlex 1.1.0
+MIT or ASL 2.0: rust-siphasher 0.3.10
+MIT or ASL 2.0: rust-smol_str 0.1.23
+MIT or ASL 2.0: rust-syn 1.0.98
+MIT or ASL 2.0: rust-term_size 0.3.2
+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-time 0.3.11
+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-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-vec_map 0.8.2
+MIT or ASL 2.0: rust-version_check 0.9.4
+MIT or ASL 2.0: rust-yaml-rust 0.4.5
+MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4
+MIT: rust-ansi_term 0.12.1
+MIT: rust-atty 0.2.14
+MIT: rust-bincode 1.3.3
+MIT: rust-box_drawing 0.1.2
+MIT: rust-bytelines 2.2.2
+MIT: rust-clap2 2.34.0
+MIT: rust-console 0.15.0
+MIT: rust-encoding 0.2.33
+MIT: rust-matches 0.1.9
+MIT: rust-nix 0.24.1
+MIT: rust-nom 7.1.1
+MIT: rust-onig 6.1.1
+MIT: rust-onig_sys 69.7.1
+MIT: rust-path-absolutize 3.0.11
+MIT: rust-path-dedot 3.0.14
+MIT: rust-phf0.8 0.8.0
+MIT: rust-phf_generator0.8 0.8.0
+MIT: rust-phf_macros0.8 0.8.0
+MIT: rust-phf_shared0.8 0.8.0
+MIT: rust-plist 1.3.1
+MIT: rust-rgb 0.8.33
+MIT: rust-strsim 0.10.0
+MIT: rust-syntect 5.0.0
+MIT: rust-sys-info 0.9.1
+MIT: rust-sysinfo 0.23.13
+MIT: rust-textwrap 0.15.0
+MIT: rust-textwrap0.11 0.11.0
+MIT: rust-which 4.2.5
+MIT: rust-xml-rs 0.8.4
+Unlicense or MIT: rust-aho-corasick 0.7.18
+Unlicense or MIT: rust-globset 0.4.8
+Unlicense or MIT: rust-grep-cli 0.1.6
+Unlicense or MIT: rust-memchr 2.5.0
+Unlicense or MIT: rust-regex-automata 0.1.10
+Unlicense or MIT: rust-same-file 1.0.6
+Unlicense or MIT: rust-termcolor 1.1.3
+Unlicense or MIT: rust-walkdir 2.3.2
+zlib or ASL 2.0 or MIT: rust-bytemuck 1.10.0
+zlib or ASL 2.0 or MIT: rust-tinyvec 1.6.0

rust-git-delta.spec

@@ -1,22 +1,22 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 21
 %bcond_without check
-%global __cargo_skip_build 0
 
 %global crate git-delta
 
 Name:           rust-%{crate}
-Version:        0.8.3
+Version:        0.13.0
 Release:        %autorelease
 Summary:        Syntax-highlighting pager for git
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/git-delta
-Source:         %{crates_source}
+Source0:        %{crates_source}
+Source1:        LICENSE.dependencies
 
 ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Syntax-highlighting pager for git.}
@@ -30,19 +30,26 @@ Summary:        %{summary}
 # ASL 2.0 or Boost
 # ASL 2.0 or MIT
 # BSD
+# CC0
 # LGPLv3+
 # MIT
+# MIT OR Apache-2.0
+# MIT and GPLv2 with exceptions and BSD
 # MIT or ASL 2.0
 # MIT or ASL 2.0 or zlib
 # MIT or zlib or ASL 2.0
 # Unlicense or MIT
 # zlib or ASL 2.0 or MIT
-License:        MIT and ASL 2.0 and BSD and LGPLv3+
+License:        ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ and MIT
+# LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
+%license LICENSE.dependencies
+%doc ARCHITECTURE.md
+%doc CONTRIBUTING.md
 %doc README.md
 %{_bindir}/delta
 %dir %{_datadir}/bash-completion
@@ -54,6 +61,7 @@ License:        MIT and ASL 2.0 and BSD and LGPLv3+
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+cp %{SOURCE1} .
 %cargo_prep
 
 %generate_buildrequires

sources

@@ -1 +1 @@
-SHA512 (git-delta-0.8.3.crate) = 16295097b4d67f8c33149557bb6e9f09d86949267903b47b7fbc63e62e85223f1abedfea3fb67e6359ff3c5bf24089e4276039e879ad954fcf870597b5700a1d
+SHA512 (git-delta-0.13.0.crate) = e8256807c4cd3e526178ac393f1aa7e1a66db3e5b721994494a5bc78e25709317ba3230812409fe9f4aaab76999a6531bf7eeecfd6992b435127d1deab7007a8