diff --git a/.gitignore b/.gitignore index 09cc0c2..86c4374 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sd-0.5.0.crate +/sd-0.6.1.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 new file mode 100644 index 0000000..c23542b --- /dev/null +++ b/0001-Convert-str-to-bytes-to-call-replacer.replace.patch @@ -0,0 +1,31 @@ +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 ac467e4..c473969 100644 --- a/rust-sd.spec +++ b/rust-sd.spec @@ -1,25 +1,27 @@ -# Generated by rust2rpm +# Generated by rust2rpm 9 %bcond_without check %global crate sd Name: rust-%{crate} -Version: 0.5.0 +Version: 0.6.1 Release: 1%{?dist} -Summary: An intuitive find & replace CLI +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(atomicwrites/default) >= 0.2.2 with crate(atomicwrites/default) < 0.3.0) -BuildRequires: (crate(rayon/default) >= 1.0.3 with crate(rayon/default) < 2.0.0) -BuildRequires: (crate(regex-syntax/default) >= 0.6.5 with crate(regex-syntax/default) < 0.7.0) -BuildRequires: (crate(regex/default) >= 1.1.0 with crate(regex/default) < 2.0.0) -BuildRequires: (crate(structopt/default) >= 0.2.14 with crate(structopt/default) < 0.3.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) +BuildRequires: (crate(structopt/default) >= 0.2.16 with crate(structopt/default) < 0.3.0) +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 \ @@ -53,5 +55,8 @@ Summary: %{summary} %endif %changelog +* Sun Jun 16 20:10:19 CEST 2019 Robert-André Mauchin - 0.6.1-1 +- Release 0.6.1 + * Sat Apr 13 2019 Robert-André Mauchin - 0.5.0-1 - Initial package diff --git a/sources b/sources index a09baf1..5f1dcf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sd-0.5.0.crate) = de0c6808dec0301bdc157f0b1ed9f4f703bbddc76b92e1e70034a7b82c8fc42801e5dcfad95a047c552cc69fff8e34208a9832f1d3aac1ed61a3618b338135c0 +SHA512 (sd-0.6.1.crate) = 2a74cdcf0014d464f485f25b34cd195b46c5643bec09575476e3f5f2cac1bafb6ed50a0ef707f176c03c9acb1d1e8d8c982da81c90fa252f9873ebc202d4ab30