diff --git a/0001-chore-Update-serde_bytes-to-0.11.patch b/0001-chore-Update-serde_bytes-to-0.11.patch new file mode 100644 index 0000000..160fd0c --- /dev/null +++ b/0001-chore-Update-serde_bytes-to-0.11.patch @@ -0,0 +1,76 @@ +From 1127eb763c8d31d0b5c006c436d90b260a5bb1cf Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 12 May 2019 08:14:16 +0200 +Subject: [PATCH] chore: Update serde_bytes to 0.11 + +Signed-off-by: Igor Gnatenko +--- + tests/decode.rs | 12 ++++-------- + tests/encode.rs | 3 +-- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/tests/decode.rs b/tests/decode.rs +index 0322c42..ceba3c2 100644 +--- a/tests/decode.rs ++++ b/tests/decode.rs +@@ -309,9 +309,8 @@ fn pass_bin8_into_bytebuf() { + + let mut de = Deserializer::new(cur); + let actual: ByteBuf = Deserialize::deserialize(&mut de).unwrap(); +- let actual: Vec = actual.into(); + +- assert_eq!(vec![0xcc, 0x80], actual); ++ assert_eq!([0xcc, 0x80], actual[..]); + } + + #[test] +@@ -323,9 +322,8 @@ fn pass_bin16_into_bytebuf() { + + let mut de = Deserializer::new(cur); + let actual: ByteBuf = Deserialize::deserialize(&mut de).unwrap(); +- let actual: Vec = actual.into(); + +- assert_eq!(vec![0xcc, 0x80], actual); ++ assert_eq!([0xcc, 0x80], actual[..]); + } + + #[test] +@@ -337,9 +335,8 @@ fn pass_bin32_into_bytebuf() { + + let mut de = Deserializer::new(cur); + let actual: ByteBuf = Deserialize::deserialize(&mut de).unwrap(); +- let actual: Vec = actual.into(); + +- assert_eq!(vec![0xcc, 0x80], actual); ++ assert_eq!([0xcc, 0x80], actual[..]); + } + + #[test] +@@ -352,9 +349,8 @@ fn pass_bin8_into_bytebuf_regression_growing_buffer() { + + let mut de = Deserializer::new(cur); + let (large, small): (ByteBuf, ByteBuf) = Deserialize::deserialize(&mut de).unwrap(); +- let (large, small): (Vec, Vec) = (large.into(), small.into()); + +- assert_eq!((b"quux".to_vec(), b"bar".to_vec()), (large, small)); ++ assert_eq!((b"quux".to_vec(), b"bar".to_vec()), (large.into_vec(), small.into_vec())); + } + + #[test] +diff --git a/tests/encode.rs b/tests/encode.rs +index a20eb32..c1c4d6e 100644 +--- a/tests/encode.rs ++++ b/tests/encode.rs +@@ -295,8 +295,7 @@ fn pass_bin() { + use serde_bytes::Bytes; + + let mut buf = Vec::new(); +- let vec = vec![0xcc, 0x80]; +- let val = Bytes::from(&vec[..]); ++ let val = Bytes::new(&[0xcc, 0x80]); + + val.serialize(&mut Serializer::new(&mut buf)).ok().unwrap(); + +-- +2.21.0 + diff --git a/rmp-serde-fix-metadata.diff b/rmp-serde-fix-metadata.diff new file mode 100644 index 0000000..41ed9d1 --- /dev/null +++ b/rmp-serde-fix-metadata.diff @@ -0,0 +1,8 @@ +--- rmp-serde-0.13.7/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ rmp-serde-0.13.7/Cargo.toml 2019-05-12T06:53:53.683908+00:00 +@@ -33,4 +33,4 @@ + version = "1" + + [dev-dependencies.serde_bytes] +-version = "0.10" ++version = "0.11" diff --git a/rust-rmp-serde.spec b/rust-rmp-serde.spec index 87a5912..918490c 100644 --- a/rust-rmp-serde.spec +++ b/rust-rmp-serde.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm +# Generated by rust2rpm-9-1.fc31 %bcond_with check %global debug_package %{nil} @@ -6,13 +6,19 @@ Name: rust-%{crate} Version: 0.13.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serde bindings for RMP +# Upstream license specification: MIT # https://github.com/3Hren/msgpack-rust/issues/192 License: MIT URL: https://crates.io/crates/rmp-serde Source: %{crates_source} +# Initial patched metadata +# * Update serde_bytes to 0.11, https://github.com/3Hren/msgpack-rust/pull/195 +Patch0: rmp-serde-fix-metadata.diff +# Make it work with new serde_bytes +Patch0001: 0001-chore-Update-serde_bytes-to-0.11.patch ExclusiveArch: %{rust_arches} @@ -21,7 +27,7 @@ BuildRequires: (crate(byteorder/default) >= 1.0.0 with crate(byteorder/default) BuildRequires: (crate(rmp/default) >= 0.8.0 with crate(rmp/default) < 0.9.0) BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) %if %{with check} -BuildRequires: (crate(serde_bytes/default) >= 0.10.0 with crate(serde_bytes/default) < 0.11.0) +BuildRequires: (crate(serde_bytes/default) >= 0.11.0 with crate(serde_bytes/default) < 0.12.0) BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0) %endif @@ -71,6 +77,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sun May 12 08:53:53 CEST 2019 Igor Gnatenko - 0.13.7-3 +- Update serde_bytes to 0.11 + * Thu Apr 11 14:38:20 CEST 2019 Igor Gnatenko - 0.13.7-2 - Run tests in infrastructure