rpms
/
rust-bat
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 0.23.0; Fixes RHBZ#2124711

Browse Source
epel9
Fabio Valentini 2 years ago
parent 73945ccc84
commit 4411b484ae
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
6 changed files with 67 additions and 54 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

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

3
README.md
Unescape View File

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

15
bat-fix-metadata-auto.diff
Unescape View File

@ -0,0 +1,15 @@
--- bat-0.23.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bat-0.23.0/Cargo.toml 2023-07-15T20:08:40.190846+00:00
@@ -191,12 +191,6 @@
regex-fancy = ["syntect/regex-fancy"]
regex-onig = ["syntect/regex-onig"]
-[target."cfg(target_os = \"macos\")".dependencies.dirs]
-version = "5.0.0"
-
-[target."cfg(target_os = \"macos\")".dependencies.plist]
-version = "1.3"
-
[target."cfg(unix)".dev-dependencies.nix]
version = "0.26.2"
features = ["term"]

18
bat-fix-metadata.diff
Unescape View File

@ -1,8 +1,16 @@
--- bat-0.21.0/Cargo.toml 1970-01-01T00:00:01+00:00 --- bat-0.23.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bat-0.21.0/Cargo.toml 2022-07-21T08:43:28.724045+00:00 +++ bat-0.23.0/Cargo.toml 2023-07-15T20:09:07.077957+00:00
@@ -93,9 +93,8 @@ @@ -30,7 +30,6 @@
[profile.release]
lto = true
codegen-units = 1
-strip = true
[dependencies.ansi_colours]
version = "^1.2"
@@ -94,9 +93,8 @@
[dependencies.once_cell] [dependencies.once_cell]
version = "1.10" version = "1.17"
-[dependencies.path_abs] -[dependencies.path_abs]
-version = "0.5" -version = "0.5"
@ -11,4 +19,4 @@
+version = "3" +version = "3"
[dependencies.regex] [dependencies.regex]
version = "1.5.5" version = "1.7.0"

80
rust-bat.spec
Unescape View File

@ -1,10 +1,10 @@
# Generated by rust2rpm 23 # Generated by rust2rpm 24
%bcond_without check %bcond_without check
%global crate bat %global crate bat
Name: rust-bat Name: rust-bat
Version: 0.21.0 Version: 0.23.0
Release: %autorelease Release: %autorelease
Summary: Cat(1) clone with wings Summary: Cat(1) clone with wings
@ -12,7 +12,10 @@ Summary: Cat(1) clone with wings
License: MIT OR Apache-2.0 License: MIT OR Apache-2.0
URL: https://crates.io/crates/bat URL: https://crates.io/crates/bat
Source: %{crates_source} Source: %{crates_source}
# Automatically generated patch to strip foreign dependencies
Patch: bat-fix-metadata-auto.diff
# Manually created patch for downstream crate metadata changes # Manually created patch for downstream crate metadata changes
# * remove compiler settings that are incompatible with RPM packaging
# * Port from path_abs to path-absolutize: # * Port from path_abs to path-absolutize:
# https://github.com/sharkdp/bat/pull/1025 # https://github.com/sharkdp/bat/pull/1025
Patch: bat-fix-metadata.diff Patch: bat-fix-metadata.diff
@ -21,27 +24,30 @@ Patch: 0001-port-from-path_abs-to-path-absolutize.patch
BuildRequires: rust-packaging >= 23 BuildRequires: rust-packaging >= 23
%global _description %{expand: %global _description %{expand:
Cat(1) clone with wings.} A cat(1) clone with wings.}
%description %{_description} %description %{_description}
%package -n %{crate} %package -n %{crate}
Summary: %{summary} 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
# BSD-2-Clause
# CC0-1.0
# LGPL-3.0-or-later
# MIT # MIT
# MIT and GPLv2 with exceptions and BSD # MIT OR Apache-2.0
# MIT or ASL 2.0 # MIT OR Apache-2.0 OR Zlib
# MIT or ASL 2.0 or zlib # MIT OR Zlib OR Apache-2.0
# MIT or zlib or ASL 2.0 # MPL-2.0
# Unlicense or MIT # Unlicense OR MIT
# zlib or ASL 2.0 or MIT # Zlib OR Apache-2.0 OR MIT
License: ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ and 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 MPL-2.0 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 # LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description} %description -n %{crate} %{_description}
@ -56,13 +62,9 @@ License: ASL 2.0 and BSD and CC0 and GPLv2 with exceptions and LGPLv3+ an
%doc README.md %doc README.md
%{_bindir}/bat %{_bindir}/bat
%{_mandir}/man1/bat.1* %{_mandir}/man1/bat.1*
%{_datadir}/bash-completion/completions/bat %{bash_completions_dir}/bat.bash
%dir %{_datadir}/zsh %{fish_completions_dir}/bat.fish
%dir %{_datadir}/zsh/site-functions %{zsh_completions_dir}/_bat
%{_datadir}/zsh/site-functions/_bat
%dir %{_datadir}/fish
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/bat.fish
%package devel %package devel
Summary: %{summary} Summary: %{summary}
@ -154,16 +156,16 @@ use the "clap" feature of the "%{crate}" crate.
%files -n %{name}+clap-devel %files -n %{name}+clap-devel
%ghost %{crate_instdir}/Cargo.toml %ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+dirs-next-devel %package -n %{name}+dirs-devel
Summary: %{summary} Summary: %{summary}
BuildArch: noarch BuildArch: noarch
%description -n %{name}+dirs-next-devel %{_description} %description -n %{name}+dirs-devel %{_description}
This package contains library source intended for building other packages which This package contains library source intended for building other packages which
use the "dirs-next" feature of the "%{crate}" crate. use the "dirs" feature of the "%{crate}" crate.
%files -n %{name}+dirs-next-devel %files -n %{name}+dirs-devel
%ghost %{crate_instdir}/Cargo.toml %ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+git-devel %package -n %{name}+git-devel
@ -312,31 +314,21 @@ use the "wild" feature of the "%{crate}" crate.
%install %install
%cargo_install %cargo_install
# install man page
install -Dpm0644 target/release/build/%{crate}-*/out/assets/manual/bat.1 \ 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 \ install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.bash \
%{buildroot}%{_datadir}/bash-completion/completions/bat %{buildroot}/%{bash_completions_dir}/bat.bash
install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.zsh \
%{buildroot}%{_datadir}/zsh/site-functions/_bat
install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.fish \ 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} %if %{with check}
%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 %cargo_test
%endif %endif
%endif
%changelog %changelog
%autochangelog %autochangelog

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (bat-0.21.0.crate) = 5d3b3e00b961da9875eb0c74a82acd50c12bb5a0c76bfcd41109e5524344de67b78dca6c5bd5a801e833bff69529950d6c9cfa7e1964af4d0167664037d62aa9 SHA512 (bat-0.23.0.crate) = a81b2021f710b7a9b13d3500cd715de14cc87dbab0412eb90677de4ae25d29b0e295931961d664c8238a8b10db2a7472fbc3de27153a84524aceafdc78e80a50

Write Preview
Loading…
Cancel
Save