diff --git a/.gitignore b/.gitignore index 963bc80..99504ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /bat-0.18.3.crate /bat-0.21.0.crate /bat-0.23.0.crate +/bat-0.24.0.crate diff --git a/bat-fix-metadata-auto.diff b/bat-fix-metadata-auto.diff index 6729d64..9331cfb 100644 --- a/bat-fix-metadata-auto.diff +++ b/bat-fix-metadata-auto.diff @@ -1,14 +1,14 @@ ---- 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 @@ +--- bat-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ 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"] --[target."cfg(target_os = \"macos\")".dependencies.dirs] --version = "5.0.0" +-[target."cfg(target_os = \"macos\")".dependencies.home] +-version = "0.5.4" - -[target."cfg(target_os = \"macos\")".dependencies.plist] --version = "1.3" +-version = "1.4.3" - [target."cfg(unix)".dev-dependencies.nix] version = "0.26.2" diff --git a/bat-fix-metadata.diff b/bat-fix-metadata.diff index 17a8069..92dd922 100644 --- a/bat-fix-metadata.diff +++ b/bat-fix-metadata.diff @@ -1,5 +1,5 @@ ---- bat-0.23.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bat-0.23.0/Cargo.toml 2023-07-15T20:09:07.077957+00:00 +--- bat-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ bat-0.24.0/Cargo.toml 2023-10-29T19:40:36.874627+00:00 @@ -30,7 +30,6 @@ [profile.release] lto = true @@ -8,15 +8,21 @@ [dependencies.ansi_colours] version = "^1.2" -@@ -94,9 +93,8 @@ - [dependencies.once_cell] - version = "1.17" +@@ -91,12 +90,11 @@ + version = "1.18" + [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.7.0" + version = "1.8.3" diff --git a/rust-bat.spec b/rust-bat.spec index 157d93f..d8b6c51 100644 --- a/rust-bat.spec +++ b/rust-bat.spec @@ -4,11 +4,10 @@ %global crate bat Name: rust-bat -Version: 0.23.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 URL: https://crates.io/crates/bat Source: %{crates_source} @@ -18,6 +17,7 @@ Patch: bat-fix-metadata-auto.diff # * remove compiler settings that are incompatible with RPM packaging # * Port from path_abs to path-absolutize: # https://github.com/sharkdp/bat/pull/1025 +# * 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 @@ -30,6 +30,7 @@ A cat(1) clone with wings.} %package -n %{crate} Summary: %{summary} +# (Apache-2.0 OR MIT) AND BSD-3-Clause # (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 @@ -38,16 +39,14 @@ Summary: %{summary} # Apache-2.0 OR MIT # 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 OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib # MIT OR Zlib OR Apache-2.0 -# MPL-2.0 # Unlicense OR MIT # Zlib OR Apache-2.0 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 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: 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} @@ -108,18 +107,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 @@ -156,16 +143,16 @@ use the "clap" feature of the "%{crate}" crate. %files -n %{name}+clap-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+dirs-devel +%package -n %{name}+etcetera-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dirs-devel %{_description} +%description -n %{name}+etcetera-devel %{_description} This package contains library source intended for building other packages which -use the "dirs" feature of the "%{crate}" crate. +use the "etcetera" feature of the "%{crate}" crate. -%files -n %{name}+dirs-devel +%files -n %{name}+etcetera-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+git-devel @@ -204,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 @@ -216,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 @@ -264,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 @@ -305,11 +328,11 @@ use the "wild" feature of the "%{crate}" crate. %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 diff --git a/sources b/sources index e197a3f..72b5949 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bat-0.23.0.crate) = a81b2021f710b7a9b13d3500cd715de14cc87dbab0412eb90677de4ae25d29b0e295931961d664c8238a8b10db2a7472fbc3de27153a84524aceafdc78e80a50 +SHA512 (bat-0.24.0.crate) = 54ab9c32543d678004f757d51a39cf4532c9398f8df751438b1827d5c80c0bfed4244c8cb9896f318492d1df13de93566d732cc441de1b85735d36742a865128