From 00a2d1f6c563ff980b19dbd13221d6261ae3f314 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 22 Aug 2023 22:14:11 +0200 Subject: [PATCH] Fix invalid SPDX identifier in crate license --- im-rc-fix-metadata.diff | 25 +++++++++++++++++-------- rust-im-rc.spec | 4 +++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/im-rc-fix-metadata.diff b/im-rc-fix-metadata.diff index 3aeb746..80cd480 100644 --- a/im-rc-fix-metadata.diff +++ b/im-rc-fix-metadata.diff @@ -1,16 +1,25 @@ --- im-rc-15.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ im-rc-15.1.0/Cargo.toml 2023-08-06T14:52:54.312132+00:00 -@@ -62,10 +62,6 @@ - version = "1" - optional = true ++++ im-rc-15.1.0/Cargo.toml 2023-08-22T20:13:03.251008+00:00 +@@ -28,7 +28,7 @@ + "rrb-tree", + ] + categories = ["data-structures"] +-license = "MPL-2.0+" ++license = "MPL-2.0" + repository = "https://github.com/bodil/im-rs" --[dependencies.refpool] --version = "0.4" + [package.metadata.docs.rs] +@@ -60,10 +60,6 @@ + + [dependencies.rayon] + version = "1" -optional = true - - [dependencies.serde] - version = "1" +-[dependencies.refpool] +-version = "0.4" optional = true + + [dependencies.serde] @@ -106,10 +102,6 @@ [features] diff --git a/rust-im-rc.spec b/rust-im-rc.spec index 57fc869..01abfb8 100644 --- a/rust-im-rc.spec +++ b/rust-im-rc.spec @@ -10,10 +10,12 @@ Version: 15.1.0 Release: %autorelease Summary: Immutable collection datatypes (the fast but not thread safe version) -License: MPL-2.0+ +License: MPL-2.0 URL: https://crates.io/crates/im-rc Source: %{crates_source} # Manually created patch for downstream crate metadata changes +# * fix invalid SPDX identifier in crate license: +# https://github.com/bodil/im-rs/issues/210 # * drop optional "pool" feature with missing "refpool" dependency Patch: im-rc-fix-metadata.diff