From 3afca3d4c47238488b6dfc69cdae4e40d2b84086 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue, 31 Aug 2021 15:20:03 +0200
Subject: [PATCH] - Only build fence-virt subpackages for x86_64 arch  
 Resolves: rhbz#1965988

---
 fence-agents.spec | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/fence-agents.spec b/fence-agents.spec
index 80b0a72..747b2ec 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -9,7 +9,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.10.0
-Release: 8%{?alphatag:.%{alphatag}}%{?dist}
+Release: 9%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@@ -135,9 +135,9 @@ Patch4: ha-openstack-support.patch
 Patch5: bundled-pexpect.patch
 Patch6: bundled-suds.patch
 
-%global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi virt vmware_rest vmware_soap wti
+%global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
 %ifarch x86_64
-%global testagents virsh heuristics_ping aliyun aws azure_arm gce openstack
+%global testagents virsh heuristics_ping aliyun aws azure_arm gce openstack virt
 %endif
 %ifarch ppc64le
 %global testagents virsh heuristics_ping openstack
@@ -181,13 +181,20 @@ fence-agents-rsa \\
 fence-agents-rsb \\
 fence-agents-sbd \\
 fence-agents-scsi \\
-fence-virt \\
 fence-agents-vmware-rest \\
 fence-agents-vmware-soap \\
 fence-agents-wti \\
 
 EOF)
 
+%ifarch x86_64
+%global allfenceagents %(cat <<EOF
+%{allfenceagents} \\
+fence-virt \\
+
+EOF)
+%endif
+
 # Build dependencies
 ## general
 BuildRequires: autoconf automake libtool make
@@ -284,7 +291,9 @@ mv support %{buildroot}%{_usr}/lib/%{name}
 export PYTHONPATH=%{buildroot}%{_usr}/lib/%{name}/support
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_unitdir}/
+%ifarch x86_64
 install -m 0644 agents/virt/fence_virtd.service %{buildroot}/%{_unitdir}/
+%endif
 # bytecompile Python source code in a non-standard location
 %if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/fence
@@ -493,9 +502,6 @@ Support libraries for Fence Agents.
 License: GPLv2+, LGPLv2+ and ASL 2.0
 Summary: Set of unified programs capable of host isolation ("fencing")
 Requires: %{allfenceagents}
-%ifarch i686 x86_64
-Requires: fence-virt
-%endif
 %ifarch ppc64le
 Requires: fence-agents-lpar >= %{version}-%{release}
 %endif
@@ -1185,6 +1191,7 @@ Fence agent for IBM z/VM over IP.
 
 # fence-virt
 
+%ifarch x86_64
 %package -n fence-virt
 Summary: A pluggable fencing framework for virtual machines
 Requires(post):	systemd-sysv %{systemd_units}
@@ -1262,8 +1269,13 @@ locations to allow for non-local VMs to be fenced when VMs
 are located on corosync cluster nodes.
 %files -n fence-virtd-cpg
 %{_libdir}/fence-virt/cpg.so
+%endif
 
 %changelog
+* Tue Aug 31 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-9
+- Only build fence-virt subpackages for x86_64 arch
+  Resolves: rhbz#1965988
+
 * Tue Aug 31 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-8
 - OpenStack agents: add dependency
   Resolves: rhbz#1857247