From 8183e2363c5b8e64d76b2188fbbaa93e07570f39 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 15 Mar 2026 22:19:58 -0700 Subject: [PATCH] fix(mesa): split out cargo dependencies into architecture-specific files to prevent conflicts with i386 and amd64 package installs (#10641) (#10643) Not having this causes this error to happen when installing both i386 and amd64 mesa. ``` - file /usr/share/licenses/mesa-vulkan-drivers/LICENSE.dependencies conflicts between attempted installs of mesa-vulkan-drivers-1:26.0.2-2.i686 and mesa-vulkan-drivers-1:26.0.2-2.x86_64 ``` (cherry picked from commit 30f7f3f6cbafc88562395da8b4fbfbb14c0db7c6) Signed-off-by: Tulip Blossom Co-authored-by: Tulip Blossom --- anda/lib/mesa/mesa.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 0d9e142008..9ec4758104 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -87,7 +87,7 @@ Summary: Mesa graphics libraries %global ver 26.0.2 Epoch: 1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2 +Release: 3 Packager: Kyle Gospodnetich License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: https://mesa3d.org @@ -480,7 +480,7 @@ rewrite_wrap_file rustc-hash %if 0%{?with_nvk} %cargo_license_summary -%{cargo_license} > LICENSE.dependencies +%{cargo_license} > LICENSE.dependencies.%{_arch} %if 0%{?vendor_nvk_crates} %cargo_vendor_manifest %endif @@ -677,7 +677,7 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 %files vulkan-drivers %if 0%{?with_nvk} -%license LICENSE.dependencies +%license LICENSE.dependencies.%{_arch} %if 0%{?vendor_nvk_crates} %license cargo-vendor.txt %endif @@ -727,4 +727,5 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 %endif %changelog -%autochangelog +* Sun Mar 15 2026 Tulip Blossom +- Split out cargo dependencies into architecture-specific files to prevent conflicts with i386 and amd64 package installs