diff --git a/.gitignore b/.gitignore index 9b494c3..20da1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rmp-0.8.7.crate +/rmp-0.8.8.crate diff --git a/0001-fix-weaken-cursor-restrictions-in-tests.patch b/0001-fix-weaken-cursor-restrictions-in-tests.patch deleted file mode 100644 index 682de87..0000000 --- a/0001-fix-weaken-cursor-restrictions-in-tests.patch +++ /dev/null @@ -1,101 +0,0 @@ -From e96d118f7b915ff65e6c14dcccdecffb664f94ab Mon Sep 17 00:00:00 2001 -From: Evgeny Safronov -Date: Mon, 22 Jan 2018 22:08:00 +0300 -Subject: [PATCH] fix: weaken cursor restrictions in tests (#158) - -Related to https://github.com/rust-lang/rust/issues/47640. ---- - rmp/src/decode/str.rs | 2 +- - rmp/tests/func/decode/array.rs | 4 ++-- - rmp/tests/func/decode/sint.rs | 6 +++--- - rmp/tests/func/decode/string.rs | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/rmp/src/decode/str.rs b/rmp/src/decode/str.rs -index cc92659..4041f1c 100644 ---- a/rmp/src/decode/str.rs -+++ b/rmp/src/decode/str.rs -@@ -107,7 +107,7 @@ fn read_str_len_with_nread(rd: &mut R) -> Result<(u32, usize), ValueReadError - /// - /// This function is **unstable**, because it needs review. - // TODO: Stabilize. Mark error values for each error case (in docs). --pub fn read_str<'r, R>(rd: &mut R, mut buf: &'r mut [u8]) -> Result<&'r str, DecodeStringError<'r>> -+pub fn read_str<'r, R>(rd: &mut R, buf: &'r mut [u8]) -> Result<&'r str, DecodeStringError<'r>> - where R: Read - { - let len = try!(read_str_len(rd)); -diff --git a/rmp/tests/func/decode/array.rs b/rmp/tests/func/decode/array.rs -index 70492e1..1174642 100644 ---- a/rmp/tests/func/decode/array.rs -+++ b/rmp/tests/func/decode/array.rs -@@ -48,7 +48,7 @@ fn from_array16_unexpected_eof_read_size() { - let mut cur = Cursor::new(buf); - - read_array_len(&mut cur).err().unwrap(); -- assert_eq!(2, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -@@ -75,7 +75,7 @@ fn from_array32_unexpected_eof_read_size() { - let mut cur = Cursor::new(buf); - - read_array_len(&mut cur).err().unwrap(); -- assert_eq!(4, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -diff --git a/rmp/tests/func/decode/sint.rs b/rmp/tests/func/decode/sint.rs -index ba19548..ddf46ce 100644 ---- a/rmp/tests/func/decode/sint.rs -+++ b/rmp/tests/func/decode/sint.rs -@@ -108,7 +108,7 @@ fn from_i16_unexpected_eof() { - let mut cur = Cursor::new(&buf[..]); - - read_i16(&mut cur).err().unwrap(); -- assert_eq!(2, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -@@ -147,7 +147,7 @@ fn from_i32_unexpected_eof() { - let mut cur = Cursor::new(&buf[..]); - - read_i32(&mut cur).err().unwrap(); -- assert_eq!(4, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -@@ -186,7 +186,7 @@ fn from_i64_unexpected_eof() { - let mut cur = Cursor::new(&buf[..]); - - read_i64(&mut cur).err().unwrap(); -- assert_eq!(8, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -diff --git a/rmp/tests/func/decode/string.rs b/rmp/tests/func/decode/string.rs -index 1175141..6f6dd83 100644 ---- a/rmp/tests/func/decode/string.rs -+++ b/rmp/tests/func/decode/string.rs -@@ -90,7 +90,7 @@ fn from_str16_read_str_len_eof() { - let mut cur = Cursor::new(buf); - - read_str_len(&mut cur).err().unwrap(); -- assert_eq!(2, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] -@@ -117,7 +117,7 @@ fn from_str32_read_str_len_eof() { - let mut cur = Cursor::new(buf); - - read_str_len(&mut cur).err().unwrap(); -- assert_eq!(4, cur.position()); -+ assert!(cur.position() >= 1); - } - - #[test] diff --git a/rmp-fix-metadata.diff b/rmp-fix-metadata.diff deleted file mode 100644 index a52f98b..0000000 --- a/rmp-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- rmp-0.8.7/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ rmp-0.8.7/Cargo.toml 2019-07-21T08:08:59.044773+00:00 -@@ -25,6 +25,6 @@ - version = "1" - - [dependencies.num-traits] --version = "0.1" -+version = "0.2" - [dev-dependencies.quickcheck] --version = "0.3" -+version = "0.8" diff --git a/rust-rmp.spec b/rust-rmp.spec index 29bb722..650a94d 100644 --- a/rust-rmp.spec +++ b/rust-rmp.spec @@ -5,21 +5,14 @@ %global crate rmp Name: rust-%{crate} -Version: 0.8.7 -Release: 4%{?dist} +Version: 0.8.8 +Release: 1%{?dist} Summary: Pure Rust MessagePack serialization implementation # Upstream license specification: MIT -# https://github.com/3Hren/msgpack-rust/issues/192 License: MIT URL: https://crates.io/crates/rmp Source: %{crates_source} -# Initial patched metadata -# - Bump num-traits to 0.2 https://github.com/3Hren/msgpack-rust/pull/193 -# - Bump quickcheck to 0.8 https://github.com/3Hren/msgpack-rust/pull/194 -Patch0: rmp-fix-metadata.diff -# Patch which fix some tests -Patch1: https://github.com/3Hren/msgpack-rust/commit/e96d118f7b915ff65e6c14dcccdecffb664f94ab.patch#/0001-fix-weaken-cursor-restrictions-in-tests.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -44,6 +37,7 @@ which use "%{crate}" crate. %files devel %doc CHANGELOG.md README.md +%license LICENSE %{cargo_registry}/%{crate}-%{version}/ %package -n %{name}+default-devel @@ -59,9 +53,7 @@ which use "default" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep -%autosetup -N -n %{crate}-%{version_no_tilde} -%patch0 -p1 -%patch1 -p2 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %generate_buildrequires @@ -79,6 +71,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Thu Sep 12 23:44:23 CEST 2019 Robert-André Mauchin - 0.8.8-1 +- Release 0.8.8 + * Fri Jul 26 2019 Fedora Release Engineering - 0.8.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 4d354d8..22a4c46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rmp-0.8.7.crate) = e679e45d6864c7a31835941ed919aea27a591bbd0a7902b4b125556cce25d2e840c7b1dbfcc1708af71680011d33064b157b36f7b9eb8c7cd3ca1448d88ce8bb +SHA512 (rmp-0.8.8.crate) = 743f285a754ae5ec1e4a2d8f9c5d745576fe318bf091ed8966803163615eaf00a8c4f19ce36a8ab726bd6c691baecf082f4c6365b3679d1a04d2194874bd994e