From bbae48045bb2308bcc40e0440e553b55264b974f Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 10 Dec 2020 01:41:39 +0100 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#c49e8152cb4ff02eeceb25cf83aa6e8cb48c0e6d --- resource-agents.spec | 15 ++++++++++++--- sources | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 744191e..bee00b9 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -20,7 +20,7 @@ # %global upstream_prefix ClusterLabs-resource-agents -%global upstream_version 8ec8f341 +%global upstream_version ef4ec184 # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -51,8 +51,8 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -Version: 4.6.1 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 4.7.0 +Release: 1%{?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 @@ -97,8 +97,12 @@ Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4 Requires: /usr/sbin/fsck.xfs Requires: /sbin/mount.nfs /sbin/mount.nfs4 %if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} +%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8) +Requires: /usr/sbin/mount.cifs +%else Recommends: /usr/sbin/mount.cifs %endif +%endif # IPaddr2 Requires: /sbin/ip @@ -264,6 +268,8 @@ test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin %{_usr}/lib/ocf/resource.d/redhat %endif +%{_datadir}/pkgconfig/%{name}.pc + %if %{defined _unitdir} %{_unitdir}/resource-agents-deps.target %endif @@ -365,6 +371,9 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Wed Dec 9 2020 Oyvind Albrigtsen - 4.7.0-1 +- Rebase to resource-agents 4.7.0 upstream release. + * Mon Aug 24 2020 Oyvind Albrigtsen - 4.6.1-4 - spec: improvements from upstream project diff --git a/sources b/sources index f4ca8f4..c8fd442 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClusterLabs-resource-agents-8ec8f341.tar.gz) = 30a0e93340dba9a0592a6e74039cceeda45ff82313809b42dd91f9e3d91073b7ae5715d568de63299272b0e3ef63640ea066490063e53759cfa2fd2e1f83165e +SHA512 (ClusterLabs-resource-agents-ef4ec184.tar.gz) = 625e64244148a15eb9a127a28eae331dae041addeefc85bf778d851e567235ae3a5ce8839a6f05578cf212899cc63079d3c6d9a7b69643787210d6f02b2be576