From c858e0115871a336bc94f08122e4acaf2a3ca8a8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 19 Oct 2024 11:36:51 +0200 Subject: [PATCH] Update to version 14.1.1; Fixes RHBZ#2310787 --- .gitignore | 1 + ripgrep-fix-metadata-auto.diff | 10 +++++----- ripgrep-fix-metadata.diff | 8 -------- rust-ripgrep.spec | 7 ++----- rust2rpm.toml | 20 ++++++++++++++++++++ sources | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 ripgrep-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 68a0891..4056ff7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ripgrep-13.0.0.crate /ripgrep-14.0.3.crate /ripgrep-14.1.0.crate +/ripgrep-14.1.1.crate diff --git a/ripgrep-fix-metadata-auto.diff b/ripgrep-fix-metadata-auto.diff index 8cb2365..ac487b5 100644 --- a/ripgrep-fix-metadata-auto.diff +++ b/ripgrep-fix-metadata-auto.diff @@ -1,8 +1,8 @@ ---- ripgrep-14.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ripgrep-14.1.0/Cargo.toml 2024-02-02T22:42:51.554849+00:00 -@@ -182,5 +182,3 @@ +--- ripgrep-14.1.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ripgrep-14.1.1/Cargo.toml 2024-10-19T09:28:39.484694+00:00 +@@ -184,5 +184,3 @@ + [features] pcre2 = ["grep/pcre2"] - simd-accel = ["grep/simd-accel"] --[target."cfg(all(target_env = \"musl\", target_pointer_width = \"64\"))".dependencies.jemallocator] +-[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator] -version = "0.5.0" diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff deleted file mode 100644 index 3f59a59..0000000 --- a/ripgrep-fix-metadata.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- ripgrep-14.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ripgrep-14.1.0/Cargo.toml 2024-02-02T22:43:01.644913+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 1e99204..af8bfd0 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global crate ripgrep Name: rust-ripgrep -Version: 14.1.0 +Version: 14.1.1 Release: %autorelease Summary: Line-oriented search tool @@ -13,9 +13,6 @@ URL: https://crates.io/crates/ripgrep Source: %{crates_source} # 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: cargo-rpm-macros >= 24 diff --git a/rust2rpm.toml b/rust2rpm.toml index 7ca78bc..43dd58e 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,6 +1,26 @@ [package] summary = "Line-oriented search tool" +extra-files = [ + "%{_mandir}/man1/rg.1*", + "%{bash_completions_dir}/rg.bash", + "%{fish_completions_dir}/rg.fish", + "%{zsh_completions_dir}/_rg", +] [features] enable-all = true +[scripts] +install.post = [ + "# 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}", +] + diff --git a/sources b/sources index 0bc746e..197b5c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ripgrep-14.1.0.crate) = eb0234269164758d6a9051f405771f259636a79094aeee0b667931747c1c3f0f03a764b3eab0be227b8242923a5777b1a6ef31fdd410f4ba4c674764e4fac1fa +SHA512 (ripgrep-14.1.1.crate) = 8e08b9a7ace2f3c1f29e4f9d3f376ba1296ed3a13e8d8bb1ce6e657b79263bd01c64e0a281cce1c19d86dd5058681647b88ff80d4f7bedfa3f6c8f93d19f1d9f