Update to 0.24.0

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

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

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

bat-fix-metadata-auto.diff

@@ -1,6 +1,6 @@
 --- 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 @@
++++ bat-0.24.0/Cargo.toml	2023-10-29T19:40:03.835368+00:00
+@@ -199,12 +199,6 @@
  regex-fancy = ["syntect/regex-fancy"]
  regex-onig = ["syntect/regex-onig"]
  
@@ -13,5 +13,3 @@
  [target."cfg(unix)".dev-dependencies.nix]
  version = "0.26.2"
  features = ["term"]
- default-features = false
-+

bat-fix-metadata.diff

@@ -1,69 +1,28 @@
 --- 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"
- 
++++ bat-0.24.0/Cargo.toml	2023-10-29T19:40:36.874627+00:00
+@@ -30,7 +30,6 @@
  [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
+ lto = true
+ codegen-units = 1
+-strip = true
  
- [dependencies.nu-ansi-term]
--version = "0.49.0"
-+version = "0.50.0"
- 
- [dependencies.once_cell]
+ [dependencies.ansi_colours]
+ version = "^1.2"
+@@ -91,12 +90,11 @@
  version = "1.18"
  
--[dependencies.os_str_bytes]
+ [dependencies.os_str_bytes]
 -version = "~6.4"
 -optional = true
 -
 -[dependencies.path_abs]
 -version = "0.5"
 -default-features = false
++version = "~6.6"
++optional = true
++
 +[dependencies.path-absolutize]
 +version = "3"
  
  [dependencies.regex]
  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,4 +1,4 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 24
 %bcond_without check
 
 %global crate bat
@@ -8,198 +8,29 @@ Version:        0.24.0
 Release:        %autorelease
 Summary:        Cat(1) clone with wings
 
-# * 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
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/bat
 Source:         %{crates_source}
-# Automatically generated patch to strip dependencies and normalize metadata
+# Automatically generated patch to strip foreign dependencies
 Patch:          bat-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
-# * port from path_abs to path-absolutize:
+# * remove compiler settings that are incompatible with RPM packaging
+# * 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
+# * Bump os_str_bytes from 6.4 to 6.6
 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:  cargo-rpm-macros >= 24
+BuildRequires:  rust-packaging >= 23
 
 %global _description %{expand:
 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}
-
-%{_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
@@ -215,7 +46,7 @@ Summary:        %{summary}
 # 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:        Apache-2.0 AND BSD-2-Clause 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)
 # LICENSE.dependencies contains a full license breakdown
 
 %description -n %{crate} %{_description}
@@ -238,8 +69,6 @@ License:        Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Cla
 Summary:        %{summary}
 BuildArch:      noarch
 
-%{_bundled_deps}
-
 %description    devel %{_description}
 
 This package contains library source intended for building other packages which
@@ -362,6 +191,18 @@ use the "grep-cli" feature of the "%{crate}" crate.
 %files       -n %{name}+grep-cli-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+lessopen-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+lessopen-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "lessopen" feature of the "%{crate}" crate.
+
+%files       -n %{name}+lessopen-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+minimal-application-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -374,6 +215,18 @@ use the "minimal-application" feature of the "%{crate}" crate.
 %files       -n %{name}+minimal-application-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+os_str_bytes-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+os_str_bytes-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "os_str_bytes" feature of the "%{crate}" crate.
+
+%files       -n %{name}+os_str_bytes-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+paging-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -422,6 +275,18 @@ use the "regex-onig" feature of the "%{crate}" crate.
 %files       -n %{name}+regex-onig-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+run_script-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+run_script-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "run_script" feature of the "%{crate}" crate.
+
+%files       -n %{name}+run_script-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+shell-words-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -459,7 +324,7 @@ use the "wild" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %generate_buildrequires

rust2rpm.toml

@@ -1,30 +0,0 @@
-[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",
-]
-