Update to version 0.16.5; Fixes RHBZ#2123174

.gitignore

@@ -7,3 +7,4 @@
 /git-delta-0.8.0.crate
 /git-delta-0.8.3.crate
 /git-delta-0.13.0.crate
+/git-delta-0.16.5.crate

LICENSE.dependencies

@@ -1,164 +0,0 @@
-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

README.md

@@ -1,3 +0,0 @@
-# rust-git-delta
-
-The rust-git-delta package

git-delta-fix-metadata.diff

@@ -0,0 +1,38 @@
+--- git-delta-0.16.5/Cargo.toml	1970-01-01T00:00:01+00:00
++++ git-delta-0.16.5/Cargo.toml	2023-07-15T20:44:55.223448+00:00
+@@ -45,7 +45,7 @@
+ version = "0.2.14"
+ 
+ [dependencies.bat]
+-version = "0.22.1"
++version = "0.23.0"
+ features = ["regex-onig"]
+ default-features = false
+ 
+@@ -56,7 +56,7 @@
+ version = "0.1.2"
+ 
+ [dependencies.bytelines]
+-version = "=2.2.2"
++version = "2.2.2"
+ 
+ [dependencies.chrono]
+ version = "0.4.23"
+@@ -98,7 +98,7 @@
+ version = "1.4"
+ 
+ [dependencies.palette]
+-version = "0.6.1"
++version = "0.6.0"
+ 
+ [dependencies.pathdiff]
+ version = "0.2.1"
+@@ -134,7 +134,7 @@
+ version = "0.1.10"
+ 
+ [dependencies.vte]
+-version = "0.11.0"
++version = "0.10.0"
+ 
+ [dependencies.xdg]
+ version = "2.4.1"

rust-git-delta.spec

@@ -1,46 +1,49 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 %bcond_without check
 
 %global crate git-delta
 
-Name:           rust-%{crate}
+Name:           rust-git-delta
-Version:        0.13.0
+Version:        0.16.5
 Release:        %autorelease
 Summary:        Syntax-highlighting pager for git
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/git-delta
-Source0:        %{crates_source}
+Source:         %{crates_source}
-Source1:        LICENSE.dependencies
+# Manually created patch for downstream crate metadata changes
+# * bump bat dependency from 0.22.1 to 0.23.0:
+#   https://github.com/dandavison/delta/commit/953af74
+# * relax bytelines dependency from =2.2.2 to ^2.2.2
+# * temporarily downgrade palette dependency from 0.6.1 to 0.6.0
+# * temporarily downgrade vte dependency from 0.11 to 0.10
+Patch:          git-delta-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
+BuildRequires:  rust-packaging >= 23
-
-BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
-Syntax-highlighting pager for git.}
+A syntax-highlighting pager for git.}
 
 %description %{_description}
 
 %package     -n %{crate}
 Summary:        %{summary}
-# 0BSD or MIT or ASL 2.0
+# (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT
-# ASL 2.0
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
-# ASL 2.0 or Boost
+# 0BSD OR MIT OR Apache-2.0
-# ASL 2.0 or MIT
+# Apache-2.0
-# BSD
+# Apache-2.0 OR BSL-1.0
-# CC0
+# Apache-2.0 OR MIT
-# LGPLv3+
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# CC0-1.0
+# LGPL-3.0-or-later
 # MIT
 # MIT OR Apache-2.0
-# MIT and GPLv2 with exceptions and BSD
+# MIT OR Apache-2.0 OR Zlib
-# MIT or ASL 2.0
+# MIT OR Zlib OR Apache-2.0
-# MIT or ASL 2.0 or zlib
+# Unlicense OR MIT
-# MIT or zlib or ASL 2.0
+# Zlib OR Apache-2.0 OR MIT
-# Unlicense or MIT
+License:        Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only WITH GCC-exception-2.0 AND LGPL-3.0-or-later AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
-# zlib or ASL 2.0 or MIT
-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}
@@ -52,16 +55,12 @@ License:        ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ an
 %doc CONTRIBUTING.md
 %doc README.md
 %{_bindir}/delta
-%dir %{_datadir}/bash-completion
+%{bash_completions_dir}/delta.bash
-%dir %{_datadir}/bash-completion/completions
+%{fish_completions_dir}/delta.fish
-%{_datadir}/bash-completion/completions/delta.bash
+%{zsh_completions_dir}/_delta
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_delta
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
-cp %{SOURCE1} .
 %cargo_prep
 
 %generate_buildrequires
@@ -72,13 +71,18 @@ echo 'git-core'
 
 %build
 %cargo_build
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
 
 %install
 %cargo_install
+# install shell completions
+install -Dpm0644 etc/completion/completion.bash \
+    -T %{buildroot}/%{bash_completions_dir}/delta.bash
 install -Dpm0644 etc/completion/completion.bash \
-  -T %{buildroot}%{_datadir}/bash-completion/completions/delta.bash
+    -T %{buildroot}/%{fish_completions_dir}/delta.fish
 install -Dpm0644 etc/completion/completion.zsh \
-  -T %{buildroot}%{_datadir}/zsh/site-functions/_delta
+    -T %{buildroot}/%{zsh_completions_dir}/_delta
 
 %if %{with check}
 %check

rust2rpm.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+testrequires =
+  git-core

sources

@@ -1 +1 @@
-SHA512 (git-delta-0.13.0.crate) = e8256807c4cd3e526178ac393f1aa7e1a66db3e5b721994494a5bc78e25709317ba3230812409fe9f4aaab76999a6531bf7eeecfd6992b435127d1deab7007a8
+SHA512 (git-delta-0.16.5.crate) = 9ca5326502682bacf2a94c83012de9067cf9b3259a1b3171d96f670c09e130db60f11793e0af837a68f2a61b7e955baadc00a20ebe77b487657c2b80de7a2503