From 5ccb0f5815bd72869c7cdc4877ddfbc52be96a36 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Mar 2022 00:47:13 +0100 Subject: [PATCH 2/6] Update to version 1.8.0; Fixes RHBZ#2038417 --- .gitignore | 1 + .rust2rpm.conf | 3 +++ rust-indexmap.spec | 63 +++++++++++++++++++++++----------------------- sources | 2 +- 4 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 .rust2rpm.conf diff --git a/.gitignore b/.gitignore index 22c9a07..246449b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /indexmap-1.6.1.crate /indexmap-1.6.2.crate /indexmap-1.7.0.crate +/indexmap-1.8.0.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..94c5a03 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,3 @@ +[DEFAULT] +unwanted-features = + rustc-rayon diff --git a/rust-indexmap.spec b/rust-indexmap.spec index 99ef5e6..f61158e 100644 --- a/rust-indexmap.spec +++ b/rust-indexmap.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate indexmap Name: rust-%{crate} -Version: 1.7.0 +Version: 1.8.0 Release: %autorelease Summary: Hash table with consistent order and fast iteration @@ -15,11 +15,8 @@ URL: https://crates.io/crates/indexmap Source: %{crates_source} ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Hash table with consistent order and fast iteration. @@ -39,13 +36,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 LICENSE-MIT LICENSE-APACHE -%doc README.rst -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.rst +%doc %{crate_instdir}/RELEASES.rst +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -53,11 +52,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}+rayon-devel Summary: %{summary} @@ -65,11 +64,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} @@ -77,11 +76,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}+serde-1-devel Summary: %{summary} @@ -89,11 +88,11 @@ BuildArch: noarch %description -n %{name}+serde-1-devel %{_description} -This package contains library source intended for building other packages -which use "serde-1" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde-1" feature of the "%{crate}" crate. %files -n %{name}+serde-1-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -101,11 +100,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}+test_debug-devel Summary: %{summary} @@ -113,11 +112,11 @@ BuildArch: noarch %description -n %{name}+test_debug-devel %{_description} -This package contains library source intended for building other packages -which use "test_debug" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "test_debug" feature of the "%{crate}" crate. %files -n %{name}+test_debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+test_low_transition_point-devel Summary: %{summary} @@ -125,11 +124,11 @@ BuildArch: noarch %description -n %{name}+test_low_transition_point-devel %{_description} -This package contains library source intended for building other packages -which use "test_low_transition_point" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "test_low_transition_point" feature of the "%{crate}" crate. %files -n %{name}+test_low_transition_point-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 2e92323..d5d0eb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indexmap-1.7.0.crate) = 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9 +SHA512 (indexmap-1.8.0.crate) = 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43 From 2fa6fc1cac746bae1aa1eac7ea1adfc895743965 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 30 Mar 2022 23:26:01 +0200 Subject: [PATCH 3/6] Update to version 1.8.1; Fixes RHBZ#2069878 --- .gitignore | 1 + rust-indexmap.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 246449b..0c682da 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /indexmap-1.6.2.crate /indexmap-1.7.0.crate /indexmap-1.8.0.crate +/indexmap-1.8.1.crate diff --git a/rust-indexmap.spec b/rust-indexmap.spec index f61158e..5edd56b 100644 --- a/rust-indexmap.spec +++ b/rust-indexmap.spec @@ -5,7 +5,7 @@ %global crate indexmap Name: rust-%{crate} -Version: 1.8.0 +Version: 1.8.1 Release: %autorelease Summary: Hash table with consistent order and fast iteration diff --git a/sources b/sources index d5d0eb0..58907df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indexmap-1.8.0.crate) = 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43 +SHA512 (indexmap-1.8.1.crate) = 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b From 53f1deb09fb5a2117a46ddd41c47da5924c65d8f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 30 May 2022 21:39:55 +0200 Subject: [PATCH 4/6] Update to version 1.8.2; Fixes RHBZ#2091229 --- .gitignore | 1 + rust-indexmap.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0c682da..d68c72c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /indexmap-1.7.0.crate /indexmap-1.8.0.crate /indexmap-1.8.1.crate +/indexmap-1.8.2.crate diff --git a/rust-indexmap.spec b/rust-indexmap.spec index 5edd56b..27a32da 100644 --- a/rust-indexmap.spec +++ b/rust-indexmap.spec @@ -5,7 +5,7 @@ %global crate indexmap Name: rust-%{crate} -Version: 1.8.1 +Version: 1.8.2 Release: %autorelease Summary: Hash table with consistent order and fast iteration diff --git a/sources b/sources index 58907df..db9e75c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indexmap-1.8.1.crate) = 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b +SHA512 (indexmap-1.8.2.crate) = f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0 From 90223a650cdb535c8cce338d024a5a4e7cc71254 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 17 Jul 2022 22:16:42 +0200 Subject: [PATCH 5/6] Update to version 1.9.1; Fixes RHBZ#2097929 --- .gitignore | 1 + rust-indexmap.spec | 17 +++++------------ sources | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d68c72c..7c8d865 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /indexmap-1.8.0.crate /indexmap-1.8.1.crate /indexmap-1.8.2.crate +/indexmap-1.9.1.crate diff --git a/rust-indexmap.spec b/rust-indexmap.spec index 27a32da..efedf25 100644 --- a/rust-indexmap.spec +++ b/rust-indexmap.spec @@ -5,11 +5,11 @@ %global crate indexmap Name: rust-%{crate} -Version: 1.8.2 +Version: 1.9.1 Release: %autorelease Summary: Hash table with consistent order and fast iteration -# Upstream license specification: Apache-2.0/MIT +# Upstream license specification: Apache-2.0 OR MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/indexmap Source: %{crates_source} @@ -19,14 +19,7 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging >= 21 %global _description %{expand: -Hash table with consistent order and fast iteration. -The indexmap is a hash table where the iteration order of the key-value pairs -is independent of the hash values of the keys. It has the usual hash table -functionality, it preserves insertion order except after removals, and it -allows lookup of its elements by either hash table key or numerical index. A -corresponding hash set type is also provided. -This crate was initially published under the name ordermap, but it was renamed -to indexmap.} +Hash table with consistent order and fast iteration.} %description %{_description} @@ -42,8 +35,8 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE-APACHE %license %{crate_instdir}/LICENSE-MIT -%doc %{crate_instdir}/README.rst -%doc %{crate_instdir}/RELEASES.rst +%doc %{crate_instdir}/README.md +%doc %{crate_instdir}/RELEASES.md %{crate_instdir}/ %package -n %{name}+default-devel diff --git a/sources b/sources index db9e75c..f23fe57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indexmap-1.8.2.crate) = f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0 +SHA512 (indexmap-1.9.1.crate) = 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e