From de1653b7d96a1e0e9b6c1e02f0ffae5916bd0e1d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 12 Feb 2021 10:00:46 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/resource-agents.git#4fa896a7866a10ca9ac006dab6399039bb256fd4 --- resource-agents.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index bfa6976..6a3b0a8 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -52,7 +52,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.7.0 -Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 +Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -73,6 +73,15 @@ BuildRequires: python3-devel BuildRequires: python-devel %endif +%ifarch x86_64 +%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 +BuildRequires: python3-google-api-client python3-pyroute2 +%endif +%if 0%{?suse_version} +BuildRequires: python3-google-api-python-client +%endif +%endif + %if 0%{?fedora} || 0%{?centos} || 0%{?rhel} BuildRequires: docbook-style-xsl docbook-dtds %if 0%{?rhel} == 0 @@ -174,8 +183,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information. %{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.} exit 1 %endif -%setup -q -n %{upstream_prefix}-%{upstream_version} -%autopatch -p1 +%autosetup -n %{upstream_prefix}-%{upstream_version} -p1 %build if [ ! -f configure ]; then @@ -372,6 +380,9 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Fri Feb 12 2021 Oyvind Albrigtsen - 4.7.0-2 +- add BuildRequires for google lib + * Wed Jan 27 2021 Fedora Release Engineering - 4.7.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild