diff --git a/.gitignore b/.gitignore index 86c4374..9e724ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sd-0.5.0.crate /sd-0.6.1.crate +/sd-0.6.5.crate diff --git a/0001-Convert-str-to-bytes-to-call-replacer.replace.patch b/0001-Convert-str-to-bytes-to-call-replacer.replace.patch deleted file mode 100644 index c23542b..0000000 --- a/0001-Convert-str-to-bytes-to-call-replacer.replace.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e9aa7ddf297c2328f360e92e7e3b2978613e0a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Sun, 16 Jun 2019 20:55:24 +0200 -Subject: [PATCH] Convert str to bytes to call replacer.replace -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix #39 - -Signed-off-by: Robert-André Mauchin ---- - src/input.rs | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/input.rs b/src/input.rs -index c5fcfef..3d24100 100644 ---- a/src/input.rs -+++ b/src/input.rs -@@ -178,7 +178,10 @@ mod tests { - flags.map(ToOwned::to_owned), - ) - .unwrap(); -- assert_eq!(std::str::from_utf8(&replacer.replace(src)), Ok(target)); -+ assert_eq!( -+ std::str::from_utf8(&replacer.replace(src.as_bytes())), -+ Ok(target) -+ ); - } - - #[test] diff --git a/rust-sd.spec b/rust-sd.spec index c473969..c2aa4a2 100644 --- a/rust-sd.spec +++ b/rust-sd.spec @@ -1,22 +1,22 @@ -# Generated by rust2rpm 9 +# Generated by rust2rpm 10 %bcond_without check +%global __cargo_skip_build 0 %global crate sd Name: rust-%{crate} -Version: 0.6.1 +Version: 0.6.5 Release: 1%{?dist} Summary: Intuitive find & replace CLI License: MIT URL: https://crates.io/crates/sd Source: %{crates_source} -# https://github.com/chmln/sd/issues/39 -Patch0: https://patch-diff.githubusercontent.com/raw/chmln/sd/pull/40.patch#/0001-Convert-str-to-bytes-to-call-replacer.replace.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging +BuildRequires: (crate(man/default) >= 0.3.0 with crate(man/default) < 0.4.0) BuildRequires: (crate(memmap/default) >= 0.7.0 with crate(memmap/default) < 0.8.0) BuildRequires: (crate(rayon/default) >= 1.1.0 with crate(rayon/default) < 2.0.0) BuildRequires: (crate(regex/default) >= 1.1.7 with crate(regex/default) < 2.0.0) @@ -24,8 +24,8 @@ BuildRequires: (crate(structopt/default) >= 0.2.16 with crate(structopt/default BuildRequires: (crate(tempfile/default) >= 3.0.8 with crate(tempfile/default) < 4.0.0) BuildRequires: (crate(unescape/default) >= 0.1.0 with crate(unescape/default) < 0.2.0) -%global _description \ -An intuitive find & replace CLI. +%global _description %{expand: +Intuitive find & replace CLI.} %description %{_description} @@ -55,6 +55,9 @@ Summary: %{summary} %endif %changelog +* Tue Jun 18 23:58:04 CEST 2019 Robert-André Mauchin - 0.6.5-1 +- Release 0.6.5 (#1721651) + * Sun Jun 16 20:10:19 CEST 2019 Robert-André Mauchin - 0.6.1-1 - Release 0.6.1 diff --git a/sources b/sources index 5f1dcf7..a13fe6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sd-0.6.1.crate) = 2a74cdcf0014d464f485f25b34cd195b46c5643bec09575476e3f5f2cac1bafb6ed50a0ef707f176c03c9acb1d1e8d8c982da81c90fa252f9873ebc202d4ab30 +SHA512 (sd-0.6.5.crate) = 8856b04aac7aba3696a70d063b21932232b12c4e8b74c0de6e4d9f639f6d1698d94a46ac465d5e8b803d804c6a543f29bae64989b39142de4f7106d959267403