From 2c6eb7229ddbb708df14e042fcdcd04984bc0fa9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 22 Jul 2022 12:45:54 +0200 Subject: [PATCH] Update to version 0.7.1; Fixes RHBZ#2097258 --- .gitignore | 1 + ron-fix-metadata.diff | 12 ++++++++++++ rust-ron.spec | 10 +++++++--- sources | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 ron-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 61037b6..368987c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ron-0.6.4.crate /ron-0.6.5.crate /ron-0.7.0.crate +/ron-0.7.1.crate diff --git a/ron-fix-metadata.diff b/ron-fix-metadata.diff new file mode 100644 index 0000000..a22427e --- /dev/null +++ b/ron-fix-metadata.diff @@ -0,0 +1,12 @@ +--- ron-0.7.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ron-0.7.1/Cargo.toml 2022-07-22T10:38:19.155801+00:00 +@@ -53,9 +53,6 @@ + version = "1.0.60" + features = ["serde_derive"] + +-[dev-dependencies.option_set] +-version = "0.1" +- + [dev-dependencies.serde_bytes] + version = "0.11" + diff --git a/rust-ron.spec b/rust-ron.spec index e35ac85..c5c36dd 100644 --- a/rust-ron.spec +++ b/rust-ron.spec @@ -5,7 +5,7 @@ %global crate ron Name: rust-%{crate} -Version: 0.7.0 +Version: 0.7.1 Release: %autorelease Summary: Rusty Object Notation @@ -13,6 +13,9 @@ Summary: Rusty Object Notation License: MIT or ASL 2.0 URL: https://crates.io/crates/ron Source: %{crates_source} +# Initial patched metadata +# * drop missing option_set dev-dependency +Patch0: ron-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -65,6 +68,8 @@ use the "indexmap" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 +# drop the only test that requires option_set +rm tests/152_bitflags.rs %cargo_prep %generate_buildrequires @@ -78,8 +83,7 @@ use the "indexmap" feature of the "%{crate}" crate. %if %{with check} %check -# * skip a unit test that fails with Rust 1.61+ -%cargo_test -- -- --skip test_nul_in_string +%cargo_test %endif %changelog diff --git a/sources b/sources index 888b2a4..e064bfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ron-0.7.0.crate) = 1d690def70a47df838c69c042fd183037ca1b6becf2e013d9c30944e2d77b89249c22fdcb286a720c0ee181051b8ea19f62971ef3762f63fc121570d8fdd7fbf +SHA512 (ron-0.7.1.crate) = 02298f035304e791c99fb16c6301d040e3a348180aacf31ddd00abc0a694901bd1820c8479fadd72028fda8681c45ff6a203c6100ae9037c845cba74b7f9f8c8