From b636fca34baf949f19d246f9774b193b8584d9ee Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 5 Feb 2024 08:35:43 +0100 Subject: [PATCH] Do not add automatic provides for private sub-packages These sub-packages (errmsg and common) are only required by the same build of mariadb. When built with the automatic provides (that adds %{_isa} as well), these noarch sub-packages cause koji to complain and build to fail with: BuildError: The following noarch package built differently on different architectures: mariadb-errmsg-10.11.6-2.fc40.noarch.rpm rpmdiff output was: removed PROVIDES mariadb-errmsg(x86-32) = 3:10.11.6-2.fc40 removed PROVIDES mariadb10.11-errmsg(x86-32) = 3:10.11.6-2.fc40 added PROVIDES mariadb-errmsg(x86-64) = 3:10.11.6-2.fc40 added PROVIDES mariadb10.11-errmsg(x86-64) = 3:10.11.6-2.fc40 --- mariadb10.11.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mariadb10.11.spec b/mariadb10.11.spec index c19bf26..2679f78 100644 --- a/mariadb10.11.spec +++ b/mariadb10.11.spec @@ -381,7 +381,9 @@ Summary: The shared files required by server and client BuildArch: noarch Requires: %{_sysconfdir}/my.cnf -%add_metadata common +# Only conflicts, provides would add %%{_isa} provides for noarch, +# which is not wanted +%conflict_with_other_streams common %if %{without clibrary} Obsoletes: %{pkgname}-libs <= %{sameevr} @@ -399,7 +401,9 @@ Summary: The error messages files required by server and embedded BuildArch: noarch Requires: %{pkgname}-common = %{sameevr} -%add_metadata errmsg +# Only conflicts, provides would add %%{_isa} provides for noarch, +# which is not wanted +%conflict_with_other_streams errmsg %description -n %{pkgname}-errmsg The package provides error messages files for the MariaDB daemon and the