rpms/mariadb10.11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not add automatic provides for private sub-packages

Browse Source 
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
This commit is contained in:
Honza Horak 2024-02-05 08:35:43 +01:00
parent aaaf2ae734
commit b636fca34b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mariadb10.11.spec
View File

@ -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