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