diff --git a/.gitignore b/.gitignore index 8ca392d..361516b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ripgrep-0.7.1.crate +/ripgrep-0.8.0.crate diff --git a/0001-Update-to-memmap-0.6.patch b/0001-Update-to-memmap-0.6.patch deleted file mode 100644 index 1d3031d..0000000 --- a/0001-Update-to-memmap-0.6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e7e087a5eee08454e4d90f2fb4e0714c7d38a905 Mon Sep 17 00:00:00 2001 -From: Dan Burkert -Date: Sat, 28 Oct 2017 15:32:43 -0700 -Subject: [PATCH] Update to memmap 0.6 - -`memmap` 0.6.0 introduces major API changes in anticipation of a 1.0 -release. See https://github.com/danburkert/memmap-rs/releases/tag/0.6.0 -for more information. CC danburkert/memmap-rs#33. ---- - src/worker.rs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/worker.rs b/src/worker.rs -index 51b7f64..9aa0fdc 100644 ---- a/src/worker.rs -+++ b/src/worker.rs -@@ -5,7 +5,7 @@ use std::path::Path; - use encoding_rs::Encoding; - use grep::Grep; - use ignore::DirEntry; --use memmap::{Mmap, Protection}; -+use memmap::Mmap; - use termcolor::WriteColor; - - use decoder::DecodeReader; -@@ -290,8 +290,8 @@ impl Worker { - // regular read calls. - return self.search(printer, path, file); - } -- let mmap = try!(Mmap::open(file, Protection::Read)); -- let buf = unsafe { mmap.as_slice() }; -+ let mmap = unsafe { try!(Mmap::map(file)) }; -+ let buf = &*mmap; - if buf.len() >= 3 && Encoding::for_bom(buf).is_some() { - // If we have a UTF-16 bom in our memory map, then we need to fall - // back to the stream reader, which will do transcoding. --- -2.15.0 - diff --git a/ripgrep-0.7.1-fix-metadata.diff b/ripgrep-0.7.1-fix-metadata.diff deleted file mode 100644 index 5d62448..0000000 --- a/ripgrep-0.7.1-fix-metadata.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- ripgrep-0.7.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ ripgrep-0.7.1/Cargo.toml 2018-01-09T08:13:12.330492+01:00 -@@ -57,10 +57,10 @@ - version = "0.1.7" - - [dependencies.memmap] --version = "0.5" -+version = "0.6" - - [dependencies.bytecount] --version = "0.1.4" -+version = "0.3" - - [dependencies.num_cpus] - version = "1" -@@ -69,7 +69,7 @@ - version = "2" - - [dependencies.lazy_static] --version = "0.2" -+version = "1" - - [dependencies.env_logger] - version = "0.4" -@@ -87,11 +87,9 @@ - version = "2.26" - - [build-dependencies.lazy_static] --version = "0.2" -+version = "1" - - [features] --simd-accel = ["bytecount/simd-accel", "regex/simd-accel", "encoding_rs/simd-accel"] --avx-accel = ["bytecount/avx-accel"] - [badges.travis-ci] - repository = "BurntSushi/ripgrep" - diff --git a/ripgrep-0.8.0-fix-metadata.diff b/ripgrep-0.8.0-fix-metadata.diff new file mode 100644 index 0000000..d721dac --- /dev/null +++ b/ripgrep-0.8.0-fix-metadata.diff @@ -0,0 +1,14 @@ +--- ripgrep-0.8.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ ripgrep-0.8.0/Cargo.toml 2018-02-12T20:33:17.762748+01:00 +@@ -93,11 +93,6 @@ + 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] +-version = "0.3" +-features = ["std", "winnt"] + [badges.appveyor] + repository = "BurntSushi/ripgrep" + diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index e813416..fa38e46 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -4,8 +4,8 @@ %global crate ripgrep Name: rust-%{crate} -Version: 0.7.1 -Release: 10%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Line oriented search tool using Rust's regex library License: Unlicense or MIT @@ -13,36 +13,31 @@ URL: https://crates.io/crates/ripgrep Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No simd -# * Bump memmap to 0.6, https://github.com/BurntSushi/ripgrep/pull/657 -# * Bump bytecount to 0.2, https://github.com/BurntSushi/ripgrep/pull/679 -# * Bump lazy_static to 1, https://github.com/BurntSushi/ripgrep/pull/699 -# * Bump bytecount to 0.3, https://github.com/BurntSushi/ripgrep/pull/739 -Patch0: ripgrep-0.7.1-fix-metadata.diff -# Really make code compatible with memmap v0.6 -Patch1: 0001-Update-to-memmap-0.6.patch +# * No windows +Patch0: ripgrep-0.8.0-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging # [dependencies] BuildRequires: (crate(atty) >= 0.2.2 with crate(atty) < 0.3.0) -BuildRequires: (crate(bytecount) >= 0.3.0 with crate(bytecount) < 0.4.0) -BuildRequires: (crate(clap) >= 2.26.0 with crate(clap) < 3.0.0) +BuildRequires: (crate(bytecount) >= 0.3.1 with crate(bytecount) < 0.4.0) +BuildRequires: ((crate(clap) >= 2.29.4 with crate(clap) < 3.0.0) with crate(clap/suggestions) with crate(clap/color)) BuildRequires: (crate(encoding_rs) >= 0.7.0 with crate(encoding_rs) < 0.8.0) -BuildRequires: (crate(env_logger) >= 0.4.0 with crate(env_logger) < 0.5.0) -BuildRequires: (crate(grep) >= 0.1.7 with crate(grep) < 0.2.0) -BuildRequires: (crate(ignore) >= 0.3.1 with crate(ignore) < 0.4.0) +BuildRequires: (crate(globset) >= 0.3.0 with crate(globset) < 0.4.0) +BuildRequires: (crate(grep) >= 0.1.8 with crate(grep) < 0.2.0) +BuildRequires: (crate(ignore) >= 0.4.0 with crate(ignore) < 0.5.0) BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(log) >= 0.3.0 with crate(log) < 0.4.0) +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.1 with crate(regex) < 0.3.0) +BuildRequires: (crate(regex) >= 0.2.4 with crate(regex) < 0.3.0) BuildRequires: (crate(same-file) >= 1.0.0 with crate(same-file) < 2.0.0) -BuildRequires: (crate(termcolor) >= 0.3.3 with crate(termcolor) < 0.4.0) +BuildRequires: (crate(termcolor) >= 0.3.4 with crate(termcolor) < 0.4.0) # [build-dependencies] -BuildRequires: (crate(clap) >= 2.26.0 with crate(clap) < 3.0.0) +BuildRequires: ((crate(clap) >= 2.29.4 with crate(clap) < 3.0.0) with crate(clap/suggestions) with crate(clap/color)) BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) %description @@ -93,6 +88,9 @@ the raw performance of grep with the usability of the silver searcher. %{_datadir}/zsh/site-functions/_rg %changelog +* Mon Feb 12 2018 Igor Gnatenko - 0.8.0-1 +- Update to 0.8.0 + * Fri Feb 09 2018 Fedora Release Engineering - 0.7.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 3749167..914fc36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ripgrep-0.7.1.crate) = e8f84241b464c83599ca5162e5dec71a052689795140414dfa631945c258237b02cf22e87851daaa4a450be90f14270ac7d1372119488038cc8c449318e19e40 +SHA512 (ripgrep-0.8.0.crate) = 096de1dbcb23bbb37685b44297fdf02d9a911c3328f8a0ddf8f13009dff95bbe1792783e65a761bcb3116c39e9bafd50513c1e5464faf5de3606d1c77e36da1c