The package rpms/rust-associative-cache.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-associative-cache.git/commit/?i....
Change: -%ifarch %{ix86} %{arm}
Thanks.
Full change: ============
commit a393ed4d472fda64e19a515f3e14d751cd1530ef Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Mar 31 20:07:56 2026 +0100
Update to version 3.0.0; Fixes RHBZ#2451317
diff --git a/.gitignore b/.gitignore index a9bdb96..5f49319 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /associative-cache-1.0.1.crate /associative-cache-2.0.0.crate +/associative-cache-3.0.0.crate diff --git a/associative-cache-fix-metadata.diff b/associative-cache-fix-metadata.diff deleted file mode 100644 index 6632024..0000000 --- a/associative-cache-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- associative-cache-2.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ associative-cache-2.0.0/Cargo.toml 2023-10-10T19:11:36.242692+00:00 -@@ -31,6 +31,8 @@ - ] - license = "MIT OR Apache-2.0" - repository = "https://github.com/fitzgen/associative-cache" -+exclude = ["/ci/", "/azure-pipelines.yaml"] -+ - - [package.metadata.docs.rs] - all-features = true diff --git a/rust-associative-cache.spec b/rust-associative-cache.spec index 74b22b9..743f90a 100644 --- a/rust-associative-cache.spec +++ b/rust-associative-cache.spec @@ -1,43 +1,32 @@ -# Generated by rust2rpm 24 - -# * tests fail on 32-bit arches -# https://github.com/fitzgen/associative-cache/issues/15 -%ifarch %{ix86} %{arm} -%bcond check 0 -%else +# Generated by rust2rpm 28 %bcond check 1 -%endif %global debug_package %{nil}
%global crate associative-cache
Name: rust-associative-cache -Version: 2.0.0 +Version: 3.0.0 Release: %autorelease Summary: Generic N-way associative cache
License: MIT OR Apache-2.0 URL: https://crates.io/crates/associative-cache -Source0: %{crates_source} -# Upstream is inactive/unresponsive and has not included the license texts. -# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14 -# The upstream maintainers explicitly specify in Cargo.toml that the crate is -# licensed under the SPDX identifier "MIT OR Apache-2.0". -# Both of these licenses require including their texts when distributing the -# software. -# In compliance with -# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuideline... , -# we include the license text from canonical sources in the package ourselves. -# When/if upstream responds to the aforementioned issue report, -# these will be removed. -Source1: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE -Source2: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT -# Manually created patch for downstream crate metadata changes -# - Remove unnecessary packages from packaged crate. -# We don't need to include CI configuration in the package. -Patch: associative-cache-fix-metadata.diff - -BuildRequires: rust-packaging >= 21 +Source: %{crates_source} +# * # Upstream is inactive/unresponsive and has not included the license texts. +# # A bug was filled: https://github.com/fitzgen/associative-cache/issues/14 +# # The upstream maintainers explicitly specify in Cargo.toml that the crate is +# # licensed under the SPDX identifier "MIT OR Apache-2.0". +# # Both of these licenses require including their texts when distributing the +# # software. +# # In compliance with +# # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuideline... , +# # we include the license text from canonical sources in the package ourselves. +# # When/if upstream responds to the aforementioned issue report, +# # these will be removed. +Source2: https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE +Source3: https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT + +BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand: A generic N-way associative cache with fixed-size capacity and random or @@ -85,8 +74,11 @@ use the "rand" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml
%prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -cp -p %{S:1} %{S:2} . +%autosetup -n %{crate}-%{version} -p1 +cp -p %{S:2} %{S:3} . +# Remove useless execute bit from Rust sources +# https://github.com/fitzgen/associative-cache/pull/27 +find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+' %cargo_prep
%generate_buildrequires @@ -100,8 +92,16 @@ cp -p %{S:1} %{S:2} .
%if %{with check} %check -# Doctests are broken -%cargo_test -- --lib +%if 0%{?__isa_bits} == 32 +# * Tests fail on 32-bit architectures +# * https://github.com/fitzgen/associative-cache/issues/15 +%{cargo_test -- -- --exact %{shrink: + --skip indices::tests::pointer_direct_mapped + --skip indices::tests::pointer_two_way +}} +%else +%cargo_test +%endif %endif
%changelog diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..a7522ed --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,56 @@ +[package] +# Upstream: “Generic N-way associative cache with fixed-size capacity and +# random or least recently used” +summary = "Generic N-way associative cache" +license-files.include = [ + "LICENSE-APACHE", + "LICENSE-MIT", +] + +[[package.extra-sources]] +number = 2 +file = "https://www.apache.org/licenses/LICENSE-2.0.txt#/LICENSE-APACHE" +comments = [ + """\ +# Upstream is inactive/unresponsive and has not included the license texts. +# A bug was filled: https://github.com/fitzgen/associative-cache/issues/14 +# The upstream maintainers explicitly specify in Cargo.toml that the crate is +# licensed under the SPDX identifier "MIT OR Apache-2.0". +# Both of these licenses require including their texts when distributing the +# software. +# In compliance with +# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuideline... , +# we include the license text from canonical sources in the package ourselves. +# When/if upstream responds to the aforementioned issue report, +# these will be removed. +""", +] + +[[package.extra-sources]] +number = 3 +file = "https://github.com/spdx/license-list-data/raw/main/text/MIT.txt#/LICENSE-MIT" + +[scripts.prep] +pre = [ + "cp -p %{S:2} %{S:3} .", + "# Remove useless execute bit from Rust sources", + "# https://github.com/fitzgen/associative-cache/pull/27", + "find src -type f -name '*.rs' -executable -exec chmod -v a-x '{}' '+'", +] + +[scripts.check] +pre = [ + """\ +%if 0%{?__isa_bits} == 32 +# * Tests fail on 32-bit architectures +# * https://github.com/fitzgen/associative-cache/issues/15 +%{cargo_test -- -- --exact %{shrink: + --skip indices::tests::pointer_direct_mapped + --skip indices::tests::pointer_two_way +}} +%else\ +""", +] +post = [ + "%endif", +] diff --git a/sources b/sources index f2fc034..0433784 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (associative-cache-2.0.0.crate) = 854f5130f286aaa76ffa2f4cbe27ca57c8220ec517c0d6fac46e5a505a3cb5fdc9ab60818db9f890b63ce2f44d243594d44747f7a87af9f304aaab3f4a4e8567 +SHA512 (associative-cache-3.0.0.crate) = 839258f61af470cda946d35fcdae22f59f7fd1484248d599c393b29e2171af6308e04e6fee43640a23d21c8677e73149ad5eb5e79806f0e8acb1668f9abd6f69