diff --git a/base/comps/librsvg2/librsvg2.comp.toml b/base/comps/librsvg2/librsvg2.comp.toml index b393367f34a..b9f143cdafc 100644 --- a/base/comps/librsvg2/librsvg2.comp.toml +++ b/base/comps/librsvg2/librsvg2.comp.toml @@ -1,5 +1,20 @@ [components.librsvg2] +# Use vendored Rust dependencies (like RHEL) to avoid dynamic cargo BR generation +# which pulls in rust-image+avif-native → dav1d, a crate not available in AZL. +# https://52.249.25.247/koji/taskinfo?taskID=2590970 +[[components.librsvg2.overlays]] +description = "Enable bundled Rust dependencies — AZL does not ship dav1d crate needed by rust-image+avif-native" +type = "spec-search-replace" +regex = '%global\s+bundled_rust_deps\s+0' +replacement = '%global bundled_rust_deps 1' + +[[components.librsvg2.overlays]] +description = "Replace rust-toolset BR with cargo-rpm-macros — AZL does not ship rust-toolset metapackage" +type = "spec-search-replace" +regex = 'BuildRequires:\s+rust-toolset' +replacement = 'BuildRequires: cargo-rpm-macros' + [[components.librsvg2.overlays]] description = "Disable AVIF support to remove dav1d dependency" type = "spec-search-replace" diff --git a/locks/librsvg2.lock b/locks/librsvg2.lock index 4692019e055..85a88fc50dd 100644 --- a/locks/librsvg2.lock +++ b/locks/librsvg2.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '020553e6ac8882267f982a33a68ec3c139f02457' upstream-commit = '020553e6ac8882267f982a33a68ec3c139f02457' -input-fingerprint = 'sha256:2192e6a2924b3dd4dd83180fdb69c4e463dbaac7bb948a61badde02c853317cb' +input-fingerprint = 'sha256:c47097874f102e69e4f5dde69c02533bd55a49704ad3be8d2f9e665f15f5b83b' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/l/librsvg2/librsvg2.spec b/specs/l/librsvg2/librsvg2.spec index e1a2dc1342e..1c88a4b2bfa 100644 --- a/specs/l/librsvg2/librsvg2.spec +++ b/specs/l/librsvg2/librsvg2.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 7; + release_number = 8; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -18,7 +18,7 @@ %if 0%{?rhel} %global bundled_rust_deps 1 %else -%global bundled_rust_deps 0 +%global bundled_rust_deps 1 %endif %global cairo_version 1.18.0 @@ -94,7 +94,7 @@ BuildRequires: pkgconfig(pangoft2) BuildRequires: vala BuildRequires: /usr/bin/rst2man %if 0%{?bundled_rust_deps} -BuildRequires: rust-toolset +BuildRequires: cargo-rpm-macros %else BuildRequires: cargo-rpm-macros %endif @@ -198,6 +198,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md %changelog ## START: Generated by rpmautospec +* Fri Jun 05 2026 Autumn Nash - 2.61.0-8 +- librsvg2: fix BR-unresolvable nightly failure + * Mon May 18 2026 Thien Trung Vuong - 2.61.0-7 - fix(librsvg2): disable AVIF support to remove dav1d dependency