From 7a79fecd6216ce124197d24a36b25a6c5e445c98 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 31 Dec 2023 20:04:30 +0100 Subject: [PATCH] Update to version 14.0.3; Fixes RHBZ#2251763 --- .gitignore | 1 + ripgrep-fix-metadata-auto.diff | 10 +++++----- ripgrep-fix-metadata.diff | 7 ++++--- rust-ripgrep.spec | 36 ++++++++++++++++------------------ rust2rpm.conf | 4 ---- rust2rpm.toml | 6 ++++++ sources | 2 +- 7 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 5356860..f9c9623 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ripgrep-12.1.0.crate /ripgrep-12.1.1.crate /ripgrep-13.0.0.crate +/ripgrep-14.0.3.crate diff --git a/ripgrep-fix-metadata-auto.diff b/ripgrep-fix-metadata-auto.diff index 253a4b1..e29d676 100644 --- a/ripgrep-fix-metadata-auto.diff +++ b/ripgrep-fix-metadata-auto.diff @@ -1,8 +1,8 @@ ---- ripgrep-13.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ripgrep-13.0.0/Cargo.toml 2023-05-22T11:26:12.724117+00:00 -@@ -91,5 +91,3 @@ - [features] +--- ripgrep-14.0.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ripgrep-14.0.3/Cargo.toml 2023-12-31T18:20:38.204348+00:00 +@@ -182,5 +182,3 @@ pcre2 = ["grep/pcre2"] simd-accel = ["grep/simd-accel"] + -[target."cfg(all(target_env = \"musl\", target_pointer_width = \"64\"))".dependencies.jemallocator] --version = "0.3.0" +-version = "0.5.0" diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff index 12853aa..94a130c 100644 --- a/ripgrep-fix-metadata.diff +++ b/ripgrep-fix-metadata.diff @@ -1,7 +1,8 @@ ---- ripgrep-13.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ripgrep-13.0.0/Cargo.toml 2023-05-22T11:26:26.249194+00:00 -@@ -90,4 +90,3 @@ +--- ripgrep-14.0.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ripgrep-14.0.3/Cargo.toml 2023-12-31T18:21:01.894425+00:00 +@@ -180,5 +180,3 @@ [features] pcre2 = ["grep/pcre2"] -simd-accel = ["grep/simd-accel"] +- diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index 669b974..760fc5d 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -1,23 +1,23 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global crate ripgrep Name: rust-ripgrep -Version: 13.0.0 +Version: 14.0.3 Release: %autorelease Summary: Line-oriented search tool License: Unlicense OR MIT URL: https://crates.io/crates/ripgrep Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: ripgrep-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop unsupported SIMD feature Patch: ripgrep-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Ripgrep is a line-oriented search tool that recursively searches the @@ -31,11 +31,10 @@ Summary: %{summary} # (Apache-2.0 OR MIT) AND BSD-3-Clause # (MIT OR Apache-2.0) AND Unicode-DFS-2016 # Apache-2.0 OR BSL-1.0 -# Apache-2.0 OR MIT # MIT # MIT OR Apache-2.0 # Unlicense OR MIT -License: BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) +License: BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -57,30 +56,29 @@ License: BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL %{zsh_completions_dir}/_rg %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires %cargo_generate_buildrequires -a -echo '/usr/bin/asciidoctor' %build %cargo_build -a -%cargo_license_summary -a +%{cargo_license_summary -a} %{cargo_license -a} > LICENSE.dependencies %install %cargo_install -a -# install manpage -install -Dpm0644 -t %{buildroot}%{_mandir}/man1 \ - target/release/build/%{crate}-*/out/rg.1 -# install shell completions -install -Dpm0644 -t %{buildroot}%{bash_completions_dir} \ - target/release/build/%{crate}-*/out/rg.bash -install -Dpm0644 -t %{buildroot}%{fish_completions_dir} \ - target/release/build/%{crate}-*/out/rg.fish -install -Dpm0644 -t %{buildroot}%{zsh_completions_dir} \ - complete/_rg +# generate and install manpage +target/release/rg --generate man > rg.1 +install -Dpm 0644 rg.1 -t %{buildroot}/%{_mandir}/man1/ +# generate and install shell completions +target/release/rg --generate complete-bash > rg.bash +target/release/rg --generate complete-fish > rg.fish +target/release/rg --generate complete-zsh > _rg +install -Dpm 0644 rg.bash -t %{buildroot}/%{bash_completions_dir} +install -Dpm 0644 rg.fish -t %{buildroot}/%{fish_completions_dir} +install -Dpm 0644 _rg -t %{buildroot}/%{zsh_completions_dir} %if %{with check} %check diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 5f336f1..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -all-features = true -buildrequires = - /usr/bin/asciidoctor diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..7ca78bc --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,6 @@ +[package] +summary = "Line-oriented search tool" + +[features] +enable-all = true + diff --git a/sources b/sources index 825a84c..eca0b33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ripgrep-13.0.0.crate) = 5a8b42ae941a282cbc020ffe0a83d4c6f7b29a2a00a2ed2f3ae89b182a1576d9ce2ca3a1c00f666990604b6b5b37f39332698cf3ceaa3a21287ea6480415a42b +SHA512 (ripgrep-14.0.3.crate) = d52b9a89152a0f8f5c90d3bfe234a7f0c50b5803e46385903cf18027bf8a574a0587f79afde1a1ba70fe74c87c6a35d0649b9ab3dd410dff892ad13cb6b31bef