From 2dc8f5c05b645089d5a0be9ca3ae58143fee2306 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 8 Oct 2025 11:37:52 +0200 Subject: [PATCH] - build: make nfs-utils a weak dependency (update based on upstream changes) Resolves: RHEL-113500 --- resource-agents.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 59ea053..9ca44de 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.16.0 -Release: 29%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 30%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -159,8 +159,12 @@ Requires: /usr/sbin/fsck.xfs %if 0%{?fedora} > 40 || 0%{?rhel} > 9 || 0%{?suse_version} Recommends: /usr/sbin/mount.nfs /usr/sbin/mount.nfs4 %else +%if 0%{?rhel} > 8 +Recommends: /sbin/mount.nfs /sbin/mount.nfs4 +%else Requires: /sbin/mount.nfs /sbin/mount.nfs4 %endif +%endif %if (0%{?fedora} && 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 @@ -625,11 +629,15 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Tue Oct 7 2025 Oyvind Albrigtsen - 4.16.0-29 -- portblock: add promotable and nftables support +* Wed Oct 8 2025 Oyvind Albrigtsen - 4.16.0-30 - build: make nfs-utils a weak dependency - Resolves: RHEL-116149, RHEL-116152, RHEL-113500 + Resolves: RHEL-113500 + +* Tue Oct 7 2025 Oyvind Albrigtsen - 4.16.0-29 +- portblock: add promotable and nftables support + + Resolves: RHEL-116149, RHEL-116152 * Mon Sep 22 2025 Oyvind Albrigtsen - 4.16.0-27 - podman-etcd: wrap ipv6 address in brackets