diff --git a/resource-agents.spec b/resource-agents.spec index df0ea10..d26f85e 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.10.0 -Release: 86%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 87%{?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 @@ -226,7 +226,15 @@ Requires: which Requires: /sbin/fsck Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4 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 @@ -242,7 +250,20 @@ Requires: /sbin/ip Requires: /usr/sbin/lvm # nfsserver / netfs.sh -Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd +%if 0%{?fedora} > 40 || 0%{?rhel} > 9 || 0%{?suse_version} +Recommends: /usr/sbin/rpc.statd +%else +%if 0%{?rhel} > 8 +Recommends: /sbin/rpc.statd +%else +Requires: /sbin/rpc.statd +%endif +%endif +%if 0%{?fedora} > 40 || 0%{?rhel} > 8 || 0%{?suse_version} +Recommends: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd +%else +Requires: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd +%endif # ocf.py Requires: python3 @@ -752,6 +773,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Oct 8 2025 Oyvind Albrigtsen - 4.10.0-87 +- build: make nfs-utils a weak dependency + + Resolves: RHEL-116100 + * Thu Oct 2 2025 Oyvind Albrigtsen - 4.10.0-86 - portblock: add promotable support