diff --git a/.gitignore b/.gitignore index fb6d1e0..bd58458 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /grep-0.1.7.crate /grep-0.1.8.crate /grep-0.1.9.crate +/grep-0.2.2.crate diff --git a/grep-fix-metadata.diff b/grep-fix-metadata.diff new file mode 100644 index 0000000..71e2940 --- /dev/null +++ b/grep-fix-metadata.diff @@ -0,0 +1,27 @@ +--- grep-0.2.2/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ grep-0.2.2/Cargo.toml 2018-09-08T14:29:57.428471+02:00 +@@ -39,17 +39,6 @@ + + [dependencies.grep-searcher] + version = "0.1.1" +-[dev-dependencies.atty] +-version = "0.2.11" +- +-[dev-dependencies.clap] +-version = "2.32.0" +-features = ["suggestions"] +-default-features = false +- +-[dev-dependencies.regex] +-version = "1" +- + [dev-dependencies.termcolor] + version = "1" + +@@ -57,6 +46,4 @@ + version = "2.2.2" + + [features] +-avx-accel = ["grep-searcher/avx-accel"] + pcre2 = ["grep-pcre2"] +-simd-accel = ["grep-searcher/simd-accel"] diff --git a/rust-grep.spec b/rust-grep.spec index c220706..0853637 100644 --- a/rust-grep.spec +++ b/rust-grep.spec @@ -5,22 +5,34 @@ %global crate grep Name: rust-%{crate} -Version: 0.1.9 +Version: 0.2.2 Release: 1%{?dist} Summary: Fast line oriented regex searching as a library +# Upstream license specification: Unlicense/MIT License: Unlicense or MIT URL: https://crates.io/crates/grep Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +# Initial patched metadata +# * No SIMD +# * Remove unneeded deps, https://github.com/BurntSushi/ripgrep/pull/1043 +Patch0: grep-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging # [dependencies] -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(regex) >= 1.0.0 with crate(regex) < 2.0.0) -BuildRequires: (crate(regex-syntax) >= 0.6.0 with crate(regex-syntax) < 0.7.0) +BuildRequires: (crate(grep-cli) >= 0.1.1 with crate(grep-cli) < 0.2.0) +BuildRequires: (crate(grep-matcher) >= 0.1.1 with crate(grep-matcher) < 0.2.0) +BuildRequires: (crate(grep-pcre2) >= 0.1.1 with crate(grep-pcre2) < 0.2.0) +BuildRequires: (crate(grep-printer) >= 0.1.1 with crate(grep-printer) < 0.2.0) +BuildRequires: (crate(grep-regex) >= 0.1.1 with crate(grep-regex) < 0.2.0) +BuildRequires: (crate(grep-searcher) >= 0.1.1 with crate(grep-searcher) < 0.2.0) +%if %{with check} +# [dev-dependencies] +BuildRequires: (crate(termcolor) >= 1.0.0 with crate(termcolor) < 2.0.0) +BuildRequires: (crate(walkdir) >= 2.2.2 with crate(walkdir) < 3.0.0) +%endif %description %{summary}. @@ -56,6 +68,9 @@ which use %{crate} from crates.io. %{cargo_registry}/%{crate}-%{version}/ %changelog +* Sat Sep 08 2018 Igor Gnatenko - 0.2.2-1 +- Update to 0.2.2 + * Sat Aug 04 2018 Josh Stone - 0.1.9-1 - Update to 0.1.9 diff --git a/sources b/sources index e7acb5a..7ffc5b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grep-0.1.9.crate) = 1ce3c1c1faf2d001bdafc6e021ec3523e08cfaec611bbaf70492cf0038578c2e738ead0df826229fbc0f5e54ff3f9f9cf928be9223bb53907f12b6f468545ef3 +SHA512 (grep-0.2.2.crate) = de4bc3931921884c06cf53bcca6e0fa9b08c703bc9eea5446fc7b2bdddd7ba444feda545f48f323f6f60a6e2a11edeffe511e4b8afe020ed16eec1d1b3efd35f