From 0f2beed71e9c3dae148ba2cb340f7f006fd64ffb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 23 Oct 2024 23:51:28 +0200 Subject: [PATCH] Drop unused lessopen feature and its dependencies --- bat-fix-metadata-auto.diff | 2 +- bat-fix-metadata.diff | 27 +++++++++++++++++++++------ rust-bat.spec | 38 +------------------------------------- rust2rpm.toml | 2 +- 4 files changed, 24 insertions(+), 45 deletions(-) diff --git a/bat-fix-metadata-auto.diff b/bat-fix-metadata-auto.diff index 93fefc2..e3638a6 100644 --- a/bat-fix-metadata-auto.diff +++ b/bat-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- bat-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bat-0.24.0/Cargo.toml 2024-06-02T20:59:58.535240+00:00 ++++ bat-0.24.0/Cargo.toml 2024-10-23T21:47:41.348860+00:00 @@ -199,13 +199,8 @@ regex-fancy = ["syntect/regex-fancy"] regex-onig = ["syntect/regex-onig"] diff --git a/bat-fix-metadata.diff b/bat-fix-metadata.diff index e541d3b..4429de5 100644 --- a/bat-fix-metadata.diff +++ b/bat-fix-metadata.diff @@ -1,5 +1,5 @@ --- bat-0.24.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bat-0.24.0/Cargo.toml 2024-06-02T21:00:30.381361+00:00 ++++ bat-0.24.0/Cargo.toml 2024-10-23T21:49:08.185292+00:00 @@ -24,7 +24,7 @@ homepage = "https://github.com/sharkdp/bat" readme = "README.md" @@ -9,7 +9,7 @@ repository = "https://github.com/sharkdp/bat" [profile.release] -@@ -85,18 +85,17 @@ +@@ -85,25 +85,16 @@ optional = true [dependencies.nu-ansi-term] @@ -19,18 +19,33 @@ [dependencies.once_cell] 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.4" -+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", diff --git a/rust-bat.spec b/rust-bat.spec index 9195d3e..e57fc40 100644 --- a/rust-bat.spec +++ b/rust-bat.spec @@ -19,8 +19,8 @@ Patch: bat-fix-metadata-auto.diff # * port from path_abs to path-absolutize: # https://github.com/sharkdp/bat/pull/1025 # * bump nu-ansi-term from 0.49.0 to 0.50.0 -# * relax os_str_bytes dependency from ~6.4 to ^6.4 # * 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 @@ -359,18 +359,6 @@ 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 @@ -383,18 +371,6 @@ 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 @@ -443,18 +419,6 @@ 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 diff --git a/rust2rpm.toml b/rust2rpm.toml index 593cb2b..b937b92 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -2,8 +2,8 @@ cargo-toml-patch-comments = [ "port from path_abs to path-absolutize: https://github.com/sharkdp/bat/pull/1025", "bump nu-ansi-term from 0.49.0 to 0.50.0", - "relax os_str_bytes dependency from ~6.4 to ^6.4", "adapt license tag to reflect bundled content", + "drop unused lessopen feature and its dependencies", ] extra-files = [ "%{_mandir}/man1/bat.1*",