Update to version 0.8.7; Fixes RHBZ#2256230

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -9,3 +9,8 @@
 /ahash-0.7.3.crate
 /ahash-0.7.4.crate
 /ahash-0.7.6.crate
+/ahash-0.8.2.crate
+/ahash-0.8.3.crate
+/ahash-0.8.5.crate
+/ahash-0.8.6.crate
+/ahash-0.8.7.crate

README.md

@@ -1,3 +0,0 @@
-# rust-ahash
-
-The rust-ahash package

ahash-fix-metadata.diff

@@ -0,0 +1,30 @@
+--- ahash-0.8.7/Cargo.toml	1970-01-01T00:00:01+00:00
++++ ahash-0.8.7/Cargo.toml	2024-01-04T16:34:49.328136+00:00
+@@ -75,16 +75,6 @@
+ bench = true
+ doc = true
+ 
+-[[bench]]
+-name = "ahash"
+-path = "tests/bench.rs"
+-harness = false
+-
+-[[bench]]
+-name = "map"
+-path = "tests/map_tests.rs"
+-harness = false
+-
+ [dependencies.atomic-polyfill]
+ version = "1.0.1"
+ optional = true
+@@ -108,10 +98,6 @@
+ version = "0.7.31"
+ features = ["simd"]
+ default-features = false
+-
+-[dev-dependencies.criterion]
+-version = "0.3.2"
+-features = ["html_reports"]
+ 
+ [dev-dependencies.fnv]
+ version = "1.0.5"

rust-ahash.spec

@@ -1,29 +1,25 @@
-# Generated by rust2rpm 18
-# * disable tests to around compilation issues on some architectures
-%bcond_with check
+# Generated by rust2rpm 25
+%bcond_without check
 %global debug_package %{nil}
 
 %global crate ahash
 
-Name:           rust-%{crate}
-Version:        0.7.6
+Name:           rust-ahash
+Version:        0.8.7
 Release:        %autorelease
 Summary:        Non-cryptographic hash function using AES-NI for high performance
 
-# Upstream license specification: MIT OR Apache-2.0
-License:        MIT or ASL 2.0
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/ahash
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * drop unused benchmarks and benchmark-only criterion dev-dependency
+Patch:          ahash-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
-
-BuildRequires:  rust-packaging
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
-Non-cryptographic hash function using AES-NI for high performance.}
+A non-cryptographic hash function using AES-NI for high performance.}
 
 %description %{_description}
 
@@ -33,13 +29,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-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/FAQ.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -47,11 +45,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}+atomic-polyfill-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+atomic-polyfill-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "atomic-polyfill" feature of the "%{crate}" crate.
+
+%files       -n %{name}+atomic-polyfill-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+compile-time-rng-devel
 Summary:        %{summary}
@@ -59,11 +69,11 @@ BuildArch:      noarch
 
 %description -n %{name}+compile-time-rng-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "compile-time-rng" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "compile-time-rng" feature of the "%{crate}" crate.
 
 %files       -n %{name}+compile-time-rng-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+const-random-devel
 Summary:        %{summary}
@@ -71,11 +81,59 @@ BuildArch:      noarch
 
 %description -n %{name}+const-random-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "const-random" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "const-random" feature of the "%{crate}" crate.
 
 %files       -n %{name}+const-random-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+getrandom-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+getrandom-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "getrandom" feature of the "%{crate}" crate.
+
+%files       -n %{name}+getrandom-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+nightly-arm-aes-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-arm-aes-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "nightly-arm-aes" feature of the "%{crate}" crate.
+
+%files       -n %{name}+nightly-arm-aes-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+no-rng-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+no-rng-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "no-rng" feature of the "%{crate}" crate.
+
+%files       -n %{name}+no-rng-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+runtime-rng-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+runtime-rng-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "runtime-rng" feature of the "%{crate}" crate.
+
+%files       -n %{name}+runtime-rng-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+serde-devel
 Summary:        %{summary}
@@ -83,11 +141,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}
@@ -95,15 +153,17 @@ 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
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
+# remove benchmark sources from non-standard path in tests/
+rm tests/{bench.rs,map_tests.rs}
 
 %generate_buildrequires
 %cargo_generate_buildrequires
@@ -116,8 +176,14 @@ which use "std" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
+%ifarch s390x
+# * one test fails only on s390x:
+#   https://github.com/tkaitchuck/aHash/issues/152
+%cargo_test -- -- --skip operations::test::test_add_length
+%else
 %cargo_test
 %endif
+%endif
 
 %changelog
 %autochangelog

sources

@@ -1 +1 @@
-SHA512 (ahash-0.7.6.crate) = 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
+SHA512 (ahash-0.8.7.crate) = 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6