From d742c6e39e77cbed81692da80a75efc3d2570ff2 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Fri, 24 Jul 2020 10:00:48 +0200 Subject: [PATCH] - Make Samba/CIFS dependency weak for Fedora < 33 and remove the dependency from 33+ --- resource-agents.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 9d8c2ba..c40b48a 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.6.1 -Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -97,7 +97,10 @@ Requires: /usr/sbin/fuser /bin/mount Requires: /sbin/fsck 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 /usr/sbin/mount.cifs +Requires: /sbin/mount.nfs /sbin/mount.nfs4 +%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos_version} && 0%{?centos_version} < 9) || 0%{?suse_version} +Recommends: /usr/sbin/mount.cifs +%endif # IPaddr2 Requires: /sbin/ip @@ -355,6 +358,10 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Fri Jul 24 2020 Oyvind Albrigtsen - 4.6.1-2 +- Make Samba/CIFS dependency weak for Fedora 32 and remove the + dependency from 33+ + * Thu Jun 18 2020 Oyvind Albrigtsen - 4.6.1-1 - Rebase to resource-agents 4.6.1 upstream release.