Bump git2 dependency from 0.18 to 0.19

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

.gitignore

@@ -16,3 +16,5 @@
 /bat-0.17.1.crate
 /bat-0.18.3.crate
 /bat-0.21.0.crate
+/bat-0.23.0.crate
+/bat-0.24.0.crate

0001-port-from-nix-0.26-to-0.29.patch

@@ -0,0 +1,35 @@
+From 272e1ce7a34961d2c71b06f5a50a1f6671ffb236 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Thu, 24 Oct 2024 00:44:18 +0200
+Subject: [PATCH] port from nix 0.26 to 0.29
+
+---
+ tests/integration_tests.rs | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
+index 8d2d362..267178b 100644
+--- a/tests/integration_tests.rs
++++ b/tests/integration_tests.rs
+@@ -9,7 +9,6 @@ use tempfile::tempdir;
+ mod unix {
+     pub use std::fs::File;
+     pub use std::io::{self, Write};
+-    pub use std::os::unix::io::FromRawFd;
+     pub use std::path::PathBuf;
+     pub use std::process::Stdio;
+     pub use std::thread;
+@@ -307,8 +306,8 @@ fn no_args_doesnt_break() {
+     // not exit, because in this case it is safe to read and write to the same fd, which is why
+     // this test exists.
+     let OpenptyResult { master, slave } = openpty(None, None).expect("Couldn't open pty.");
+-    let mut master = unsafe { File::from_raw_fd(master) };
+-    let stdin_file = unsafe { File::from_raw_fd(slave) };
++    let mut master = File::from(master);
++    let stdin_file = File::from(slave);
+     let stdout_file = stdin_file.try_clone().unwrap();
+     let stdin = Stdio::from(stdin_file);
+     let stdout = Stdio::from(stdout_file);
+-- 
+2.47.0
+

README.md

@@ -1,3 +0,0 @@
-# rust-bat
-
-The rust-bat package

bat-fix-metadata-auto.diff

@@ -0,0 +1,17 @@
+--- bat-0.24.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ bat-0.24.0/Cargo.toml	2024-10-29T18:01:07.310721+00:00
+@@ -199,13 +199,8 @@
+ regex-fancy = ["syntect/regex-fancy"]
+ regex-onig = ["syntect/regex-onig"]
+ 
+-[target."cfg(target_os = \"macos\")".dependencies.home]
+-version = "0.5.4"
+-
+-[target."cfg(target_os = \"macos\")".dependencies.plist]
+-version = "1.4.3"
+-
+ [target."cfg(unix)".dev-dependencies.nix]
+ version = "0.26.2"
+ features = ["term"]
+ default-features = false
++

bat-fix-metadata.diff

@@ -1,9 +1,37 @@
---- bat-0.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ bat-0.21.0/Cargo.toml	2022-07-21T08:43:28.724045+00:00
-@@ -93,9 +93,8 @@
+--- bat-0.24.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ bat-0.24.0/Cargo.toml	2024-10-29T18:02:15.768076+00:00
+@@ -24,7 +24,7 @@
+ homepage = "https://github.com/sharkdp/bat"
+ readme = "README.md"
+ categories = ["command-line-utilities"]
+-license = "MIT OR Apache-2.0"
++license = "(MIT OR Apache-2.0) AND Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-SA-3.0 AND MIT AND Unlicense AND WTFPL"
+ repository = "https://github.com/sharkdp/bat"
+ 
+ [profile.release]
+@@ -73,7 +73,7 @@
+ version = "1.0"
+ 
+ [dependencies.git2]
+-version = "0.18"
++version = "0.19"
+ optional = true
+ default-features = false
+ 
+@@ -85,25 +85,16 @@
+ optional = true
+ 
+ [dependencies.nu-ansi-term]
+-version = "0.49.0"
++version = "0.50.0"
+ 
  [dependencies.once_cell]
- version = "1.10"
+ version = "1.18"
  
+-[dependencies.os_str_bytes]
+-version = "~6.4"
+-optional = true
+-
 -[dependencies.path_abs]
 -version = "0.5"
 -default-features = false
@@ -11,4 +39,31 @@
 +version = "3"
  
  [dependencies.regex]
- version = "1.5.5"
+ version = "1.8.3"
+-optional = true
+-
+-[dependencies.run_script]
+-version = "^0.10.0"
+ optional = true
+ 
+ [dependencies.semver]
+@@ -181,10 +172,6 @@
+ ]
+ default = ["application"]
+ git = ["git2"]
+-lessopen = [
+-    "run_script",
+-    "os_str_bytes",
+-]
+ minimal-application = [
+     "clap",
+     "etcetera",
+@@ -200,7 +187,7 @@
+ regex-onig = ["syntect/regex-onig"]
+ 
+ [target."cfg(unix)".dev-dependencies.nix]
+-version = "0.26.2"
++version = "0.29"
+ features = ["term"]
+ default-features = false
+ 

rust-bat.spec

@@ -1,47 +1,221 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 26
 %bcond_without check
 
 %global crate bat
 
 Name:           rust-bat
-Version:        0.21.0
+Version:        0.24.0
 Release:        %autorelease
 Summary:        Cat(1) clone with wings
 
-# Upstream license specification: MIT/Apache-2.0
-License:        MIT OR Apache-2.0
+# * bat crate: MIT OR Apache-2.0
+# * bundled content: Apache-2.0, BSD-2-Clause, BSD-2-Clause-Views, BSD-3-Clause, CC-BY-SA-3.0, MIT, Unlicense, WTFPL, UltraPermissive
+License:        (MIT OR Apache-2.0) AND Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-SA-3.0 AND MIT AND Unlicense AND WTFPL AND LicenseRef-Fedora-UltraPermissive
 URL:            https://crates.io/crates/bat
 Source:         %{crates_source}
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch:          bat-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * Port from path_abs to path-absolutize:
+# * port from path_abs to path-absolutize:
 #   https://github.com/sharkdp/bat/pull/1025
+# * bump git2 from 0.18 to 0.19
+# * bump nix from 0.26 to 0.29
+# * bump nu-ansi-term from 0.49.0 to 0.50.0
+# * adapt license tag to reflect bundled content
+# * drop unused lessopen feature and its dependencies
 Patch:          bat-fix-metadata.diff
 Patch:          0001-port-from-path_abs-to-path-absolutize.patch
+Patch:          0001-port-from-nix-0.26-to-0.29.patch
 
-BuildRequires:  rust-packaging >= 23
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
-Cat(1) clone with wings.}
+A cat(1) clone with wings.}
+
+%global _bundled_deps %{expand:
+# Sublime Text 3 language definitions for syntax highlighting
+# from: https://github.com/sublimehq/Packages/tree/759d6ee
+# - all except Rust: LicenseRef-Fedora-UltraPermissive
+#   https://gitlab.com/fedora/legal/fedora-license-data/-/issues/516
+# - Rust: MIT
+Provides:       bundled(sublime-syntax) = 4075~git759d6ee
+
+# third-party language definitions for syntax highlighting
+# AWK: MIT
+Provides:       bundled(sublime-syntax-AWK)
+# Ada: MIT
+Provides:       bundled(sublime-syntax-Ada)
+# Apache: BSD-2-Clause-Views
+Provides:       bundled(sublime-syntax-Apache)
+# AsciiDoc: MIT
+Provides:       bundled(sublime-syntax-AsciiDoc)
+# CMake: MIT
+Provides:       bundled(sublime-syntax-CMake)
+# CoffeeScript: MIT
+Provides:       bundled(sublime-syntax-CoffeeScript)
+# Crontab: MIT
+Provides:       bundled(sublime-syntax-Crontab)
+# Crontab/cron_descriptor: MIT
+Provides:       bundled(sublime-syntax-Crontab-cron_descriptor)
+# Crystal: Apache-2.0
+Provides:       bundled(sublime-syntax-Crystal)
+# Dart: MIT
+Provides:       bundled(sublime-syntax-Dart)
+# Docker: MIT
+Provides:       bundled(sublime-syntax-Docker)
+# DotENV: MIT
+Provides:       bundled(sublime-syntax-DotENV)
+# Elixir: MIT
+Provides:       bundled(sublime-syntax-Elixir)
+# Elm: MIT
+Provides:       bundled(sublime-syntax-Elm)
+# Email: MIT
+Provides:       bundled(sublime-syntax-Email)
+# Fish: MIT
+Provides:       bundled(sublime-syntax-Fish)
+# GLSL: Unlicense
+Provides:       bundled(sublime-syntax-GLSL)
+# GraphQL: WTFPL
+Provides:       bundled(sublime-syntax-GraphQL)
+# Groff: MIT
+Provides:       bundled(sublime-syntax-Groff)
+# HTML (Twig): BSD-3-Clause
+Provides:       bundled(sublime-syntax-HTML-Twig)
+# JavaScript (Babel): MIT
+Provides:       bundled(sublime-syntax-JavaScript-Babel)
+# Jsonnet: Apache-2.0
+Provides:       bundled(sublime-syntax-Jsonnet)
+# Julia: MIT
+Provides:       bundled(sublime-syntax-Julia)
+# Kotlin: Apache-2.0
+Provides:       bundled(sublime-syntax-Kotlin)
+# LLVM: MIT
+Provides:       bundled(sublime-syntax-LLVM)
+# Lean: Apache-2.0
+Provides:       bundled(sublime-syntax-Lean)
+# LiveScript: MIT
+Provides:       bundled(sublime-syntax-LiveScript)
+# MediaWiki: MIT
+Provides:       bundled(sublime-syntax-MediaWiki)
+# NSIS: Apache-2.0
+Provides:       bundled(sublime-syntax-NSIS)
+# Nginx: MIT
+Provides:       bundled(sublime-syntax-Nginx)
+# Ninja: MIT
+Provides:       bundled(sublime-syntax-Ninja)
+# Nix: MIT
+Provides:       bundled(sublime-syntax-Nix)
+# Org mode: BSD-2-Clause
+Provides:       bundled(sublime-syntax-Org-mode)
+# PowerShell: MIT
+Provides:       bundled(sublime-syntax-PowerShell)
+# Protobuf: MIT
+Provides:       bundled(sublime-syntax-Protobuf)
+# Puppet: MIT
+Provides:       bundled(sublime-syntax-Puppet)
+# PureScript: MIT AND Unlicense
+Provides:       bundled(sublime-syntax-PureScript)
+# QML: MIT
+Provides:       bundled(sublime-syntax-QML)
+# Robot: MIT
+Provides:       bundled(sublime-syntax-Robot)
+# SCSS_Sass: MIT
+Provides:       bundled(sublime-syntax-SCSS_Sass)
+# SLS: Apache-2.0
+Provides:       bundled(sublime-syntax-SLS)
+# Slim: MIT
+Provides:       bundled(sublime-syntax-Slim)
+# Stylus: MIT
+Provides:       bundled(sublime-syntax-Stylus)
+# SublimeEthereum: MIT
+Provides:       bundled(sublime-syntax-SublimeEthereum)
+# Svelte: MIT
+Provides:       bundled(sublime-syntax-Svelte)
+# Swift: MIT
+Provides:       bundled(sublime-syntax-Swift)
+# SystemVerilog: MIT
+Provides:       bundled(sublime-syntax-SystemVerilog)
+# TOML: MIT
+Provides:       bundled(sublime-syntax-TOML)
+# Terraform: MIT
+Provides:       bundled(sublime-syntax-Terraform)
+# TypeScript: MIT
+Provides:       bundled(sublime-syntax-TypeScript)
+# VimL: MIT
+Provides:       bundled(sublime-syntax-VimL)
+# Vue: MIT
+Provides:       bundled(sublime-syntax-Vue)
+# Zig: MIT
+Provides:       bundled(sublime-syntax-Zig)
+# cmd-help: MIT
+Provides:       bundled(sublime-syntax-cmd-help)
+# gnuplot: MIT
+Provides:       bundled(sublime-syntax-gnuplot)
+# hosts: MIT
+Provides:       bundled(sublime-syntax-hosts)
+# http-request-response: MIT
+Provides:       bundled(sublime-syntax-http-request-response)
+# varlink: MIT
+Provides:       bundled(sublime-syntax-varlink)
+# vscode-wgsl: MIT
+Provides:       bundled(sublime-syntax-vscode-wgsl)
+
+# third-party themes for syntax highlighting
+# 1337-Scheme: MIT
+Provides:       bundled(sublime-theme-1337-Scheme)
+# Coldark: MIT
+Provides:       bundled(sublime-theme-Coldark)
+# DarkNeon: CC-BY-SA-3.0
+Provides:       bundled(sublime-theme-DarkNeon)
+# Nord-sublime: MIT, https://github.com/sharkdp/bat/issues/2987
+Provides:       bundled(sublime-theme-Nord-sublime)
+# Solarized: MIT
+Provides:       bundled(sublime-theme-Solarized)
+# TwoDark: MIT
+Provides:       bundled(sublime-theme-TwoDark)
+# dracula-sublime: MIT
+Provides:       bundled(sublime-theme-dracula-sublime)
+# github-sublime-theme: https://github.com/sharkdp/bat/issues/2984
+Provides:       bundled(sublime-theme-github-sublime-theme)
+# gruvbox: MIT
+Provides:       bundled(sublime-theme-gruvbox)
+# onehalf: MIT
+Provides:       bundled(sublime-theme-onehalf)
+# sublime-monokai-extended: MIT
+Provides:       bundled(sublime-theme-sublime-monokai-extended)
+# sublime-snazzy: https://github.com/sharkdp/bat/issues/2985
+Provides:       bundled(sublime-theme-sublime-snazzy)
+# visual-studio-dark-plus: https://github.com/sharkdp/bat/issues/2986
+Provides:       bundled(sublime-theme-visual-studio-dark-plus)
+# zenburn: BSD-2-Clause-Views
+Provides:       bundled(sublime-theme-zenburn)
+}
 
 %description %{_description}
 
 %package     -n %{crate}
 Summary:        %{summary}
-# 0BSD or MIT or ASL 2.0
-# ASL 2.0
-# ASL 2.0 or Boost
-# ASL 2.0 or MIT
-# BSD
-# CC0
-# LGPLv3+
+
+%{_bundled_deps}
+
+# (Apache-2.0 OR MIT) AND BSD-3-Clause
+# (MIT OR Apache-2.0) AND Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-SA-3.0 AND MIT AND Unlicense AND WTFPL
+# (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD OR MIT OR Apache-2.0
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause
+# LGPL-3.0-or-later
 # MIT
-# 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:        ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ and MIT
+# MIT OR Apache-2.0
+# MIT OR Apache-2.0 OR Zlib
+# MIT OR Zlib OR Apache-2.0
+# Unlicense OR MIT
+# Zlib OR Apache-2.0 OR MIT
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-SA-3.0 AND LGPL-3.0-or-later AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT AND Unicode-DFS-2016 AND Unlicense AND WTFPL 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)
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
@@ -56,18 +230,16 @@ License:        ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ an
 %doc README.md
 %{_bindir}/bat
 %{_mandir}/man1/bat.1*
-%{_datadir}/bash-completion/completions/bat
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_bat
-%dir %{_datadir}/fish
-%dir %{_datadir}/fish/vendor_completions.d
-%{_datadir}/fish/vendor_completions.d/bat.fish
+%{bash_completions_dir}/bat.bash
+%{fish_completions_dir}/bat.fish
+%{zsh_completions_dir}/_bat
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
+%{_bundled_deps}
+
 %description    devel %{_description}
 
 This package contains library source intended for building other packages which
@@ -106,18 +278,6 @@ use the "application" feature of the "%{crate}" crate.
 %files       -n %{name}+application-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+atty-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+atty-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "atty" feature of the "%{crate}" crate.
-
-%files       -n %{name}+atty-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+bugreport-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -154,16 +314,16 @@ use the "clap" feature of the "%{crate}" crate.
 %files       -n %{name}+clap-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+dirs-next-devel
+%package     -n %{name}+etcetera-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+dirs-next-devel %{_description}
+%description -n %{name}+etcetera-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "dirs-next" feature of the "%{crate}" crate.
+use the "etcetera" feature of the "%{crate}" crate.
 
-%files       -n %{name}+dirs-next-devel
+%files       -n %{name}+etcetera-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+git-devel
@@ -299,44 +459,34 @@ use the "wild" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
-%cargo_generate_buildrequires -a
+%cargo_generate_buildrequires
 
 %build
 %cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
 %install
 %cargo_install
-
+# install man page
 install -Dpm0644 target/release/build/%{crate}-*/out/assets/manual/bat.1 \
-  -t %{buildroot}%{_mandir}/man1/
-
+    -t %{buildroot}%{_mandir}/man1/
+# install shell completions
 install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.bash \
-  %{buildroot}%{_datadir}/bash-completion/completions/bat
-
-install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.zsh \
-  %{buildroot}%{_datadir}/zsh/site-functions/_bat
-
+    %{buildroot}/%{bash_completions_dir}/bat.bash
 install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.fish \
-  -t %{buildroot}%{_datadir}/fish/vendor_completions.d/
+    %{buildroot}/%{fish_completions_dir}/bat.fish
+install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.zsh \
+    %{buildroot}/%{zsh_completions_dir}/_bat
 
 %if %{with check}
 %check
-%ifarch %{arm} ppc64le
-# * doctests fail to compile on armv7hl with LLVM 14:
-#   https://bugzilla.redhat.com/show_bug.cgi?id=2086106
-# * doctests fail to compile on ppc64le with LLVM 15:
-#   https://bugzilla.redhat.com/show_bug.cgi?id=2142648
-%cargo_test -- --lib
-%else
 %cargo_test
 %endif
-%endif
 
 %changelog
 %autochangelog

rust2rpm.toml

@@ -0,0 +1,30 @@
+[package]
+cargo-toml-patch-comments = [
+    "port from path_abs to path-absolutize: https://github.com/sharkdp/bat/pull/1025",
+    "bump git2 from 0.18 to 0.19",
+    "bump nix from 0.26 to 0.29",
+    "bump nu-ansi-term from 0.49.0 to 0.50.0",
+    "adapt license tag to reflect bundled content",
+    "drop unused lessopen feature and its dependencies",
+]
+extra-files = [
+    "%{_mandir}/man1/bat.1*",
+    "%{bash_completions_dir}/bat.bash",
+    "%{fish_completions_dir}/bat.fish",
+    "%{zsh_completions_dir}/_bat",
+]
+
+[scripts]
+install.post = [
+    "# install man page",
+    "install -Dpm0644 target/release/build/%{crate}-*/out/assets/manual/bat.1 \\",
+    "    -t %{buildroot}%{_mandir}/man1/",
+    "# install shell completions",
+    "install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.bash \\",
+    "    %{buildroot}/%{bash_completions_dir}/bat.bash",
+    "install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.fish \\",
+    "    %{buildroot}/%{fish_completions_dir}/bat.fish",
+    "install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.zsh \\",
+    "    %{buildroot}/%{zsh_completions_dir}/_bat",
+]
+

sources

@@ -1 +1 @@
-SHA512 (bat-0.21.0.crate) = 5d3b3e00b961da9875eb0c74a82acd50c12bb5a0c76bfcd41109e5524344de67b78dca6c5bd5a801e833bff69529950d6c9cfa7e1964af4d0167664037d62aa9
+SHA512 (bat-0.24.0.crate) = 54ab9c32543d678004f757d51a39cf4532c9398f8df751438b1827d5c80c0bfed4244c8cb9896f318492d1df13de93566d732cc441de1b85735d36742a865128