diff --git a/.gitignore b/.gitignore index d1f4030..ba66826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rmp-serde-0.13.7.crate /rmp-serde-0.14.0.crate +/rmp-serde-0.14.1.crate diff --git a/0001-chore-Update-serde_bytes-to-0.11.patch b/0001-chore-Update-serde_bytes-to-0.11.patch deleted file mode 100644 index 160fd0c..0000000 --- a/0001-chore-Update-serde_bytes-to-0.11.patch +++ /dev/null @@ -1,76 +0,0 @@ -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 deleted file mode 100644 index 5eb2789..0000000 --- a/rmp-serde-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- rmp-serde-0.14.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ rmp-serde-0.14.0/Cargo.toml 2019-09-15T16:29:30.808266+00:00 -@@ -30,7 +30,7 @@ - [dependencies.serde] - version = "1.0.99" - [dev-dependencies.serde_bytes] --version = "0.10" -+version = "0.11" - - [dev-dependencies.serde_derive] - version = "1.0.99" diff --git a/rust-rmp-serde.spec b/rust-rmp-serde.spec index 93d7583..1052db3 100644 --- a/rust-rmp-serde.spec +++ b/rust-rmp-serde.spec @@ -1,23 +1,18 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil} %global crate rmp-serde Name: rust-%{crate} -Version: 0.14.0 -Release: 2%{?dist} +Version: 0.14.1 +Release: 1%{?dist} Summary: Serde bindings for RMP # Upstream license specification: MIT 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} %if %{__cargo_skip_build} @@ -43,7 +38,7 @@ which use "%{crate}" crate. %files devel %doc CHANGELOG.md %license LICENSE -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -55,7 +50,7 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -76,6 +71,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Thu Jan 30 2020 Josh Stone - 0.14.1-1 +- Update to 0.14.1 + * Thu Jan 30 2020 Fedora Release Engineering - 0.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 4e56df0..4238802 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rmp-serde-0.14.0.crate) = 33bc784e3537110fa07ed19c5c0616a1c19e4a86c3a1b2243780335e0aed6aeed4349f9cbd78d7a2ebcd489dc2114e32d91ce8bd88bd633288e6d05666ede576 +SHA512 (rmp-serde-0.14.1.crate) = 174d976d576d1de724ecd0af76ee25cad2dd77ae6de1bb9b3f3bf1cadecd7c90bec58d2e8a247c42c3701f8cc11f7548047cc316a95657f006f048a634c92f51