diff --git a/ripgrep-0.8.1-fix-metadata.diff b/ripgrep-0.8.1-fix-metadata.diff index 1b303cc..f4dcf94 100644 --- a/ripgrep-0.8.1-fix-metadata.diff +++ b/ripgrep-0.8.1-fix-metadata.diff @@ -1,18 +1,29 @@ --- ripgrep-0.8.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ ripgrep-0.8.1/Cargo.toml 2018-04-25T17:18:12.064354+02:00 ++++ ripgrep-0.8.1/Cargo.toml 2018-06-14T09:25:11.692748+02:00 @@ -50,7 +50,7 @@ version = "0.7" [dependencies.globset] -version = "0.3.0" -+version = "0.4.0" ++version = "0.4" [dependencies.grep] version = "0.1.8" -@@ -93,11 +93,6 @@ +@@ -77,7 +77,7 @@ version = "1" - [features] + [dependencies.regex] +-version = "0.2.4" ++version = "1" + + [dependencies.same-file] + version = "1" +@@ -91,13 +91,6 @@ + + [build-dependencies.lazy_static] + version = "1" +- +-[features] -avx-accel = ["bytecount/avx-accel"] -simd-accel = ["bytecount/simd-accel", "regex/simd-accel", "encoding_rs/simd-accel"] -[target."cfg(windows)".dependencies.winapi] diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index 9303933..b166243 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -5,7 +5,7 @@ Name: rust-%{crate} Version: 0.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Line oriented search tool using Rust's regex library License: Unlicense or MIT @@ -15,6 +15,7 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ # * No simd # * No windows # * Bump globset to 0.4 +# * Bump regex to 1 Patch0: ripgrep-0.8.1-fix-metadata.diff # https://github.com/BurntSushi/ripgrep/pull/857 Patch1: 0001-deps-update-regex-crate.patch @@ -38,7 +39,7 @@ BuildRequires: (crate(log) >= 0.4.0 with crate(log) < 0.5.0) BuildRequires: (crate(memchr) >= 2.0.0 with crate(memchr) < 3.0.0) BuildRequires: (crate(memmap) >= 0.6.0 with crate(memmap) < 0.7.0) BuildRequires: (crate(num_cpus) >= 1.0.0 with crate(num_cpus) < 2.0.0) -BuildRequires: (crate(regex) >= 0.2.4 with crate(regex) < 0.3.0) +BuildRequires: (crate(regex) >= 1.0.0 with crate(regex) < 2.0.0) BuildRequires: (crate(same-file) >= 1.0.0 with crate(same-file) < 2.0.0) BuildRequires: (crate(termcolor) >= 0.3.4 with crate(termcolor) < 0.4.0) # [build-dependencies] @@ -95,6 +96,9 @@ the raw performance of grep with the usability of the silver searcher. %{_datadir}/zsh/site-functions/_rg %changelog +* Thu Jun 14 2018 Igor Gnatenko - 0.8.1-5 +- Bump regex to 1 + * Wed Apr 25 2018 Igor Gnatenko