From c4ce16ae0c1d90cea9ebdf0d9db3676599827895 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: May 12 2022 14:37:43 +0000 Subject: Update to version 1.6.0; Fixes RHBZ#2078583 --- diff --git a/.gitignore b/.gitignore index 556f43d..4148639 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /tinyvec-1.3.1.crate /tinyvec-1.5.0.crate /tinyvec-1.5.1.crate +/tinyvec-1.6.0.crate diff --git a/rust-tinyvec.spec b/rust-tinyvec.spec index c9d2c19..683852d 100644 --- a/rust-tinyvec.spec +++ b/rust-tinyvec.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate tinyvec Name: rust-%{crate} -Version: 1.5.1 +Version: 1.6.0 Release: %autorelease Summary: 100% safe vec-like data structures @@ -18,11 +18,8 @@ Source: %{crates_source} Patch0: tinyvec-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: `tinyvec` provides 100% safe vec-like data structures.} @@ -35,14 +32,17 @@ 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 LICENSE-ZLIB.md LICENSE-APACHE.md LICENSE-MIT.md -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ -%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{src-backup/,gen-array-impls.sh,rustfmt.toml} +%license %{crate_instdir}/LICENSE-APACHE.md +%license %{crate_instdir}/LICENSE-MIT.md +%license %{crate_instdir}/LICENSE-ZLIB.md +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ +%exclude %{crate_instdir}/{src-backup/,*.sh,*.py,rustfmt.toml} %package -n %{name}+default-devel Summary: %{summary} @@ -50,11 +50,11 @@ 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}+alloc-devel Summary: %{summary} @@ -62,11 +62,11 @@ BuildArch: noarch %description -n %{name}+alloc-devel %{_description} -This package contains library source intended for building other packages -which use "alloc" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+arbitrary-devel Summary: %{summary} @@ -74,11 +74,11 @@ BuildArch: noarch %description -n %{name}+arbitrary-devel %{_description} -This package contains library source intended for building other packages -which use "arbitrary" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+experimental_write_impl-devel Summary: %{summary} @@ -86,11 +86,11 @@ BuildArch: noarch %description -n %{name}+experimental_write_impl-devel %{_description} -This package contains library source intended for building other packages -which use "experimental_write_impl" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "experimental_write_impl" feature of the "%{crate}" crate. %files -n %{name}+experimental_write_impl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+grab_spare_slice-devel Summary: %{summary} @@ -98,11 +98,11 @@ BuildArch: noarch %description -n %{name}+grab_spare_slice-devel %{_description} -This package contains library source intended for building other packages -which use "grab_spare_slice" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "grab_spare_slice" feature of the "%{crate}" crate. %files -n %{name}+grab_spare_slice-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly_slice_partition_dedup-devel Summary: %{summary} @@ -110,11 +110,11 @@ BuildArch: noarch %description -n %{name}+nightly_slice_partition_dedup-devel %{_description} -This package contains library source intended for building other packages -which use "nightly_slice_partition_dedup" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nightly_slice_partition_dedup" feature of the "%{crate}" crate. %files -n %{name}+nightly_slice_partition_dedup-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rustc_1_40-devel Summary: %{summary} @@ -122,11 +122,11 @@ BuildArch: noarch %description -n %{name}+rustc_1_40-devel %{_description} -This package contains library source intended for building other packages -which use "rustc_1_40" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rustc_1_40" feature of the "%{crate}" crate. %files -n %{name}+rustc_1_40-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rustc_1_55-devel Summary: %{summary} @@ -134,11 +134,23 @@ BuildArch: noarch %description -n %{name}+rustc_1_55-devel %{_description} -This package contains library source intended for building other packages -which use "rustc_1_55" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rustc_1_55" feature of the "%{crate}" crate. %files -n %{name}+rustc_1_55-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+rustc_1_57-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustc_1_57-devel %{_description} + +This package contains library source intended for building other packages which +use the "rustc_1_57" feature of the "%{crate}" crate. + +%files -n %{name}+rustc_1_57-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -146,11 +158,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 %package -n %{name}+std-devel Summary: %{summary} @@ -158,11 +170,11 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+tinyvec_macros-devel Summary: %{summary} @@ -170,11 +182,11 @@ BuildArch: noarch %description -n %{name}+tinyvec_macros-devel %{_description} -This package contains library source intended for building other packages -which use "tinyvec_macros" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tinyvec_macros" feature of the "%{crate}" crate. %files -n %{name}+tinyvec_macros-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 a405d59..0ef3159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tinyvec-1.5.1.crate) = 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849 +SHA512 (tinyvec-1.6.0.crate) = e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c diff --git a/tinyvec-fix-metadata.diff b/tinyvec-fix-metadata.diff index a3c229b..8c2e840 100644 --- a/tinyvec-fix-metadata.diff +++ b/tinyvec-fix-metadata.diff @@ -1,19 +1,20 @@ ---- tinyvec-1.5.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ tinyvec-1.5.1/Cargo.toml 2021-11-09T21:43:49.643537+00:00 -@@ -56,8 +56,6 @@ - [dependencies.tinyvec_macros] +--- tinyvec-1.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ tinyvec-1.6.0/Cargo.toml 2022-05-12T14:34:59.983167+00:00 +@@ -91,9 +91,6 @@ version = "0.1" optional = true + -[dev-dependencies.criterion] -version = "0.3.0" - +- [dev-dependencies.serde_test] version = "1.0" -@@ -71,7 +69,6 @@ + +@@ -106,7 +103,6 @@ experimental_write_impl = [] grab_spare_slice = [] nightly_slice_partition_dedup = [] -real_blackbox = ["criterion/real_blackbox"] rustc_1_40 = [] rustc_1_55 = ["rustc_1_40"] - std = [] + rustc_1_57 = ["rustc_1_55"]