Do our firmware/nonlinux packages as .noarch + ExclusiveArch

Related: rhbz#1086446

syslinux.spec

@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.02
 %define tarball_version 6.02
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@@ -10,6 +10,10 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_v
 Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch
 Patch0002: 0002-Don-t-build-efi32.patch
 
+# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
+# in noarch packages are a reason to stop the build.
+%define _binaries_in_noarch_packages_terminate_build 0
+
 ExclusiveArch: %{ix86} x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs, git
@@ -59,23 +63,24 @@ Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
 The EXTLINUX bootloader, for booting the local system, as well as all
 the SYSLINUX/PXELINUX modules in /boot.
 
+%ifarch %{ix86}
 %package tftpboot
 Summary: SYSLINUX modules in /tftpboot, available for network booting
 Group: Applications/Internet
+BuildArch: noarch
+ExclusiveArch: %{ix86} x86_64
 Requires: syslinux
-%ifarch x86_64
-Requires: syslinux-tftpboot(x86-32) = %{version}-%{release}
-%endif
 
 %description tftpboot
 All the SYSLINUX/PXELINUX modules directly available for network
 booting in the /tftpboot directory.
 
-%ifarch %{ix86}
 %package extlinux-nonlinux
 Summary: The parts of the EXTLINUX bootloader which aren't run from linux.
 Group: System/Boot
 Requires: syslinux
+BuildArch: noarch
+ExclusiveArch: %{ix86} x86_64
 
 %description extlinux-nonlinux
 All the EXTLINUX binaries that run from the firmware rather than
@@ -85,6 +90,8 @@ from a linux host.
 Summary: SYSLINUX modules which aren't run from linux.
 Group: System/Boot
 Requires: syslinux
+BuildArch: noarch
+ExclusiveArch: %{ix86} x86_64
 
 %description nonlinux
 All the SYSLINUX binaries that run from the firmware rather than from a
@@ -196,8 +203,8 @@ rm -rf %{buildroot}
 %{_sbindir}/extlinux
 %config /etc/extlinux.conf
 
-%files tftpboot
 %ifarch %{ix86}
+%files tftpboot
 /tftpboot
 
 %files nonlinux
@@ -240,6 +247,10 @@ elif [ -f /boot/extlinux.conf ]; then \
 fi
 
 %changelog
+* Tue Apr 15 2014 Peter Jones <pjones@redhat.com> - 6.02-4
+- Do our firmware/nonlinux packages as .noarch + ExclusiveArch
+  Related: rhbz#1086446
+
 * Tue Apr 15 2014 Peter Jones <pjones@redhat.com> - 6.02-3
 - -2 was entirely the wrong thing to do.