From 3413381264c01463014133e410837c62eb44881c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 12 May 2022 15:34:51 +0200 Subject: [PATCH] Update to version 15.1.0; Fixes RHBZ#2080370 --- .gitignore | 1 + im-rc-fix-metadata.diff | 47 ++++++---------------- rust-im-rc.spec | 88 ++++++++++++++++++++++++++++------------- sources | 2 +- 4 files changed, 75 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 1a91767..09a5b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /im-rc-14.2.0.crate /im-rc-14.3.0.crate /im-rc-15.0.0.crate +/im-rc-15.1.0.crate diff --git a/im-rc-fix-metadata.diff b/im-rc-fix-metadata.diff index 664b081..cd90550 100644 --- a/im-rc-fix-metadata.diff +++ b/im-rc-fix-metadata.diff @@ -1,45 +1,24 @@ ---- im-rc-15.0.0/Cargo.toml 2020-05-15T19:00:18+00:00 -+++ im-rc-15.0.0/Cargo.toml 2021-08-04T16:11:40.028148+00:00 -@@ -29,33 +29,18 @@ +--- im-rc-15.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ im-rc-15.1.0/Cargo.toml 2022-05-12T13:33:00.506027+00:00 +@@ -62,10 +62,6 @@ + version = "1" + optional = true - [lib] - path = "./src/lib.rs" --[dependencies.arbitrary] +-[dependencies.refpool] -version = "0.4" --optional = true - - [dependencies.bitmaps] - version = "2" - --[dependencies.proptest] --version = "0.9" --optional = true -- --[dependencies.quickcheck] --version = "0.9" -optional = true - - [dependencies.rand_core] --version = "0.5.1" -+version = "0.6.3" - - [dependencies.rand_xoshiro] --version = "0.4" -+version = "0.6" - - [dependencies.rayon] + [dependencies.serde] version = "1" --optional = true -- --[dependencies.refpool] --version = "0.4" optional = true - - [dependencies.serde] -@@ -96,6 +81,5 @@ +@@ -106,10 +102,6 @@ [features] debug = [] --pool = ["refpool", "sized-chunks/refpool"] +-pool = [ +- "refpool", +- "sized-chunks/refpool", +-] + [badges.travis-ci] repository = "bodil/im-rs" diff --git a/rust-im-rc.spec b/rust-im-rc.spec index 477705f..ab37935 100644 --- a/rust-im-rc.spec +++ b/rust-im-rc.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 18 -# * dev-dependencies are outdated +# Generated by rust2rpm 21 +# * missing dev-dependencies: metrohash %bcond_with check %global debug_package %{nil} %global crate im-rc Name: rust-%{crate} -Version: 15.0.0 +Version: 15.1.0 Release: %autorelease Summary: Immutable collection datatypes (the fast but not thread safe version) @@ -15,18 +15,12 @@ License: MPLv2.0 URL: https://crates.io/crates/im-rc Source: %{crates_source} # Initial patched metadata -# * bump rand_core from 0.5.1 to 0.6.3 -# * bump rand_xoshiro from 0.4 to 0.6 -# * drop unused optional features with outdated or missing dependencies: -# arbitrary, proptest, quickcheck, pool/refpool +# * drop optional "pool" feature with missing "refpool" dependency Patch0: im-rc-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Immutable collection datatypes (the fast but not thread safe version).} @@ -39,13 +33,15 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENCE.md -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENCE.md +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -53,11 +49,23 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+arbitrary-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+arbitrary-devel %{_description} + +This package contains library source intended for building other packages which +use the "arbitrary" feature of the "%{crate}" crate. + +%files -n %{name}+arbitrary-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+debug-devel Summary: %{summary} @@ -65,11 +73,35 @@ BuildArch: noarch %description -n %{name}+debug-devel %{_description} -This package contains library source intended for building other packages -which use "debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "debug" feature of the "%{crate}" crate. %files -n %{name}+debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+proptest-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+proptest-devel %{_description} + +This package contains library source intended for building other packages which +use the "proptest" feature of the "%{crate}" crate. + +%files -n %{name}+proptest-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+quickcheck-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+quickcheck-devel %{_description} + +This package contains library source intended for building other packages which +use the "quickcheck" feature of the "%{crate}" crate. + +%files -n %{name}+quickcheck-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rayon-devel Summary: %{summary} @@ -77,11 +109,11 @@ BuildArch: noarch %description -n %{name}+rayon-devel %{_description} -This package contains library source intended for building other packages -which use "rayon" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rayon" feature of the "%{crate}" crate. %files -n %{name}+rayon-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -89,11 +121,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 93e2bf9..8a8cc60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (im-rc-15.0.0.crate) = 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003 +SHA512 (im-rc-15.1.0.crate) = 2825364dd8ddfa2a3623c3b507768b8602a3a17d0a9abd10b9ad20f4e7b6dbf5b35e928129bf0708ab29207e899e82f2285d24a7de2b55de3538b4123efc8bb9