From 9c854490fefb12073c0414db557c2d974af304c5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Aug 03 2019 12:44:03 +0000 Subject: Update to 11.0.2 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index a413603..97666ca 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ripgrep-0.10.0.crate /ripgrep-11.0.0.crate /ripgrep-11.0.1.crate +/ripgrep-11.0.2.crate diff --git a/0001-bstr-update-everything-to-bstr-0.2.patch b/0001-bstr-update-everything-to-bstr-0.2.patch deleted file mode 100644 index a186a53..0000000 --- a/0001-bstr-update-everything-to-bstr-0.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b93762ea7a397b54e9ccf589a45a2c6ad91bc390 Mon Sep 17 00:00:00 2001 -From: Andrew Gallant -Date: Wed, 26 Jun 2019 16:47:33 -0400 -Subject: [PATCH] bstr: update everything to bstr 0.2 - ---- - src/config.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/config.rs b/src/config.rs -index f0f7929..3deade9 100644 ---- a/src/config.rs -+++ b/src/config.rs -@@ -9,7 +9,7 @@ use std::io; - use std::ffi::OsString; - use std::path::{Path, PathBuf}; - --use bstr::io::BufReadExt; -+use bstr::{io::BufReadExt, ByteSlice}; - use log; - - use crate::Result; --- -2.22.0 - diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff index 5ce69ab..965929f 100644 --- a/ripgrep-fix-metadata.diff +++ b/ripgrep-fix-metadata.diff @@ -1,19 +1,12 @@ ---- ripgrep-11.0.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ ripgrep-11.0.1/Cargo.toml 2019-06-27T06:59:54.367815+00:00 -@@ -43,7 +43,7 @@ - name = "integration" - path = "tests/tests.rs" - [dependencies.bstr] --version = "0.1.2" -+version = "0.2.0" - - [dependencies.clap] - version = "2.32.0" -@@ -88,7 +88,6 @@ +--- ripgrep-11.0.2/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ ripgrep-11.0.2/Cargo.toml 2019-08-03T12:42:56.325256+00:00 +@@ -88,9 +88,6 @@ [features] pcre2 = ["grep/pcre2"] -simd-accel = ["grep/simd-accel"] +-[target."cfg(all(target_env = \"musl\", target_pointer_width = \"64\"))".dependencies.jemallocator] +-version = "0.3.0" [badges.appveyor] repository = "BurntSushi/ripgrep" diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index 8f99d8b..aaaaad6 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -5,8 +5,8 @@ %global crate ripgrep Name: rust-%{crate} -Version: 11.0.1 -Release: 5%{?dist} +Version: 11.0.2 +Release: 1%{?dist} Summary: Line oriented search tool using Rust's regex library # Upstream license specification: Unlicense OR MIT @@ -15,10 +15,8 @@ URL: https://crates.io/crates/ripgrep Source: %{crates_source} # Initial patched metadata # * No simd -# * Update bstr to 0.2, https://github.com/BurntSushi/ripgrep/commit/b93762ea7a397b54e9ccf589a45a2c6ad91bc390 +# * No jemalloc Patch0: ripgrep-fix-metadata.diff -# Finish bstr update -Patch0001: 0001-bstr-update-everything-to-bstr-0.2.patch ExclusiveArch: %{rust_arches} @@ -79,6 +77,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \ %endif %changelog +* Sat Aug 03 14:42:56 CEST 2019 Igor Gnatenko - 11.0.2-1 +- Update to 11.0.2 + * Fri Jul 26 2019 Fedora Release Engineering - 11.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ae02cb0..15f8e82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ripgrep-11.0.1.crate) = 91a06a11e94cfd595ac1cc5ed6db481cff8b319de4fb09d1d29e800b60f75a4e696df75f97e0e29d53d7d68fc3fd7cebc5ae16b1329214fb1383d454fb2b0864 +SHA512 (ripgrep-11.0.2.crate) = 8a9e75ad442bc12a6b189eca39b09e890a2bbf6d9b3b55515517c97201bea8577851da443a108fe7524ec4bbe35ea624aca9c872ab31d991baab282e7265383c