From cb0682d4ee6c298457d1d1339291a23c6c422575 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 1 Jul 2021 11:12:28 +0200 Subject: [PATCH] - Fix Python 3 choosing incorrect binary Resolves: rhbz#1857247 --- fence-agents.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fence-agents.spec b/fence-agents.spec index 817b4ca..5238ab0 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.9.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?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 @@ -230,6 +230,10 @@ BuildRequires: %{systemd_units} sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac %build +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} + export PYTHON="%{__python3}" +%endif + # support libs %ifarch x86_64 LIBS="%{_sourcedir}/requirements-*.txt" @@ -249,10 +253,6 @@ done sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/support/awscli')" support/awscli/bin/aws %endif -%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version} - PYTHON="%{__python3}" -%endif - ./autogen.sh %{configure} --disable-libvirt-qmf-plugin PYTHONPATH="support/aliyun:support/aws:support/azure:support/google:support/openstack:support/pexpect" --with-agents='%{supportedagents} %{testagents}' CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags} @@ -1245,7 +1245,7 @@ are located on corosync cluster nodes. %{_libdir}/fence-virt/cpg.so %changelog -* Thu Jul 1 2021 Oyvind Albrigtsen - 4.9.0-2 +* Thu Jul 1 2021 Oyvind Albrigtsen - 4.9.0-3 - OpenStack agents: add dependency Resolves: rhbz#1857247