From ba7a0d6fc68869e9a2300f8eba54a6c0090cabf1 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Feb 01 2020 06:10:17 +0000 Subject: Avoid incorrect separate noarch build in koji This is the real fix for the broken noarch builds; drop the _binaries_in_noarch_packages_terminate_build override. --- diff --git a/fedora-coreos-config-transpiler.spec b/fedora-coreos-config-transpiler.spec index 3f65ab7..647b664 100644 --- a/fedora-coreos-config-transpiler.spec +++ b/fedora-coreos-config-transpiler.spec @@ -2,9 +2,6 @@ # Manually modified for fcct 0.4.0 %bcond_without check -# noarch -nonlinux subpackage contains non-executable binaries for other OSes -%global _binaries_in_noarch_packages_terminate_build 0 - # https://github.com/coreos/fcct %global goipath github.com/coreos/fcct Version: 0.4.0 @@ -19,7 +16,7 @@ for provisioning Fedora CoreOS machines.} %global godocs docs README.md NEWS Name: fedora-coreos-config-transpiler -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fedora CoreOS Config Transpiler # Upstream license specification: Apache-2.0 @@ -56,7 +53,6 @@ Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.0-20191010095647.gitfc94e3f716 Summary: Fedora CoreOS Config Transpiler for macOS and Windows License: ASL 2.0 BuildArch: noarch -ExclusiveArch: %{go_arches} noarch %description nonlinux %{common_description} @@ -108,6 +104,10 @@ install -p -m 0644 ./fcct-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/fcct %{_datadir}/fcct/fcct-x86_64-pc-windows-gnu.exe %changelog +* Sat Feb 01 2020 Benjamin Gilbert - 0.4.0-3 +- Avoid incorrect separate noarch build in koji +- Re-enable noarch package check; it was the wrong fix + * Fri Jan 31 2020 Benjamin Gilbert - 0.4.0-2 - Disable noarch package check that was failing the build