rpmbuild: warn if header color differs from color of the package architecture.

- For example, warn when building an x86_64 package that only contains 32
  bit binaries.
- This should indicate to the maintainers that they might have gotten the
  architecture wrong.
- Introduces 'archcolor' in rpmrc so we can map architectures to colors.
- Related: RhBug:713323

1 files changed, 11 insertions, 1 deletions

diff --git a/build/files.c b/build/files.c
index d4dc974f1..7778d2275 100644
--- a/build/files.c
+++ b/build/files.c
@@ -2109,6 +2109,8 @@ rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
     for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
 	char *nvr;
 	const char *a;
+	int header_color;
+	int arch_color;
 
 	if (pkg->fileList == NULL)
 	    continue;
@@ -2124,7 +2126,15 @@ rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
 	    goto exit;
 
 	a = headerGetString(pkg->header, RPMTAG_ARCH);
-	if (rstreq(a, "noarch") && headerGetNumber(pkg->header, RPMTAG_HEADERCOLOR) != 0) {
+	header_color = headerGetNumber(pkg->header, RPMTAG_HEADERCOLOR);
+	if (!rstreq(a, "noarch")) {
+	    arch_color = rpmGetArchColor(a);
+	    if (arch_color > 0 && !(arch_color & header_color)) {
+		rpmlog(RPMLOG_WARNING,
+		       _("Binaries arch (%d) not matching the package arch (%d).\n"),
+		       header_color, arch_color);
+	    }
+	} else if (header_color != 0) {
 	    int terminate = rpmExpandNumeric("%{?_binaries_in_noarch_packages_terminate_build}");
 	    rpmlog(terminate ? RPMLOG_ERR : RPMLOG_WARNING, 
 		   _("Arch dependent binaries in noarch package\n"));