diff --git a/.gitignore b/.gitignore index a45c479..5356860 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ripgrep-12.0.1.crate /ripgrep-12.1.0.crate /ripgrep-12.1.1.crate +/ripgrep-13.0.0.crate diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff index 91aa4ff..e182cb6 100644 --- a/ripgrep-fix-metadata.diff +++ b/ripgrep-fix-metadata.diff @@ -1,6 +1,6 @@ ---- ripgrep-12.1.1/Cargo.toml 2020-05-29T13:53:06+00:00 -+++ ripgrep-12.1.1/Cargo.toml 2020-05-29T16:35:53.608316+00:00 -@@ -91,6 +91,3 @@ +--- ripgrep-13.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ripgrep-13.0.0/Cargo.toml 2021-06-18T10:56:40.820364+00:00 +@@ -90,6 +90,3 @@ [features] pcre2 = ["grep/pcre2"] diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index a1638b5..04942fa 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -1,21 +1,21 @@ -# Generated by rust2rpm 15 +# Generated by rust2rpm 17 %bcond_without check %global __cargo_skip_build 0 %global crate ripgrep Name: rust-%{crate} -Version: 12.1.1 -Release: 6%{?dist} -Summary: Line oriented search tool using Rust's regex library +Version: 13.0.0 +Release: 1%{?dist} +Summary: Line oriented search tool # Upstream license specification: Unlicense OR MIT License: Unlicense or MIT URL: https://crates.io/crates/ripgrep Source: %{crates_source} # Initial patched metadata -# * No simd -# * No jemalloc +# * drop unsupported SIMD feature +# * drop unsupported jemalloc feature Patch0: ripgrep-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -23,25 +23,26 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging %global _description %{expand: -Line-oriented search tool that recursively searches your current directory for -a regex pattern while respecting your gitignore rules. ripgrep has first class -support on Windows, macOS and Linux.} +Line-oriented search tool that recursively searches the current directory for a +regex pattern while respecting gitignore rules. ripgrep has first class support +on Windows, macOS and Linux.} %description %{_description} %package -n %{crate} Summary: %{summary} # ASL 2.0 or Boost +# ASL 2.0 or MIT # MIT # MIT or ASL 2.0 # Unlicense or MIT -License: MIT and (Boost or ASL 2.0) +License: MIT and (ASL 2.0 or Boost) %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE-MIT UNLICENSE COPYING -%doc README.md CHANGELOG.md +%doc README.md CHANGELOG.md FAQ.md GUIDE.md %{_bindir}/rg %{_mandir}/man1/rg.1* %dir %{_datadir}/bash-completion @@ -78,21 +79,14 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \ %if %{with check} %check -# skip some tests that fail only due to cosmetic string differences -%cargo_test -a -- -- \ - --skip binary::after_match1_explicit \ - --skip binary::after_match1_implicit \ - --skip binary::after_match1_implicit_binary \ - --skip binary::after_match1_stdin \ - --skip binary::after_match2_implicit \ - --skip binary::before_match1_implicit_binary \ - --skip binary::before_match2_explicit \ - --skip misc::binary_convert \ - --skip misc::binary_convert_mmap \ - --skip misc::unrestricted3 +%cargo_test -a %endif %changelog +* Fri Jun 18 2021 Fabio Valentini - 13.0.0-1 +- Update to version 13.0.0. +- Fixes RHBZ#1971151 + * Wed May 19 2021 Fabio Valentini - 12.1.1-6 - Skip some tests that fail only due to cosmetic string differences. diff --git a/sources b/sources index 7d1ee8f..825a84c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ripgrep-12.1.1.crate) = 8468da0174e72af1a408f026ccf0bedd3aed744d7aa73399a658c55cfd5f850fffd6013686372c5d7d162f2817e336c2f30bc4768054a1fc349a19908ed43938 +SHA512 (ripgrep-13.0.0.crate) = 5a8b42ae941a282cbc020ffe0a83d4c6f7b29a2a00a2ed2f3ae89b182a1576d9ce2ca3a1c00f666990604b6b5b37f39332698cf3ceaa3a21287ea6480415a42b