- Rebase to resource-agents 4.11.0 upstream release.

This commit is contained in:
Oyvind Albrigtsen 2022-04-06 09:55:46 +02:00
parent 160cb484a1
commit 900df1400c
2 changed files with 28 additions and 7 deletions

View File

@ -20,7 +20,7 @@
# #
%global upstream_prefix ClusterLabs-resource-agents %global upstream_prefix ClusterLabs-resource-agents
%global upstream_version fd0720f7 %global upstream_version 8ac4daaf
# Whether this platform defaults to using systemd as an init system # Whether this platform defaults to using systemd as an init system
# (needs to be evaluated prior to BuildRequires being enumerated and # (needs to be evaluated prior to BuildRequires being enumerated and
@ -51,8 +51,8 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0 Version: 4.11.0
Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -99,14 +99,27 @@ BuildRequires: libxslt docbook_4 docbook-xsl-stylesheets
# system tools shared by several agents # system tools shared by several agents
Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
Requires: /bin/ps /usr/bin/pkill /usr/bin/hostname /usr/bin/netstat Requires: /bin/ps /usr/bin/pkill /usr/bin/hostname /usr/bin/netstat
Requires: /usr/sbin/fuser /bin/mount Requires: /bin/mount
%if 0%{?suse_version}
Requires: /usr/bin/fuser
%else
Requires: /usr/sbin/fuser
%endif
# Filesystem / fs.sh / netfs.sh # Filesystem / fs.sh / netfs.sh
%if 0%{?suse_version}
Requires: /usr/sbin/fsck
%else
Requires: /sbin/fsck Requires: /sbin/fsck
%endif
Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4 Requires: /usr/sbin/fsck.ext2 /usr/sbin/fsck.ext3 /usr/sbin/fsck.ext4
Requires: /usr/sbin/fsck.xfs Requires: /usr/sbin/fsck.xfs
%if 0%{?suse_version}
Requires: /usr/sbin/mount.nfs /usr/sbin/mount.nfs4
%else
Requires: /sbin/mount.nfs /sbin/mount.nfs4 Requires: /sbin/mount.nfs /sbin/mount.nfs4
%if 0%{?fedora} < 33 || (0%{?rhel} && 0%{?rhel} < 9) || (0%{?centos} && 0%{?centos} < 9) || 0%{?suse_version} %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) %if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?centos} && 0%{?centos} < 8)
Requires: /usr/sbin/mount.cifs Requires: /usr/sbin/mount.cifs
%else %else
@ -121,7 +134,12 @@ Requires: /sbin/ip
Requires: /usr/sbin/lvm Requires: /usr/sbin/lvm
# nfsserver / netfs.sh # nfsserver / netfs.sh
Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd %if 0%{?suse_version}
Requires: /usr/sbin/rpc.statd
%else
Requires: /sbin/rpc.statd
%endif
Requires: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd
# ocf-distro # ocf-distro
Requires: /usr/bin/lsb_release Requires: /usr/bin/lsb_release
@ -379,6 +397,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif %endif
%changelog %changelog
* Wed Apr 6 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.11.0-1
- Rebase to resource-agents 4.11.0 upstream release.
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2.1 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (ClusterLabs-resource-agents-fd0720f7.tar.gz) = 0ece911082accc38c680e0cf5b4becaa33575e53041125687f1e6b2a6b5e56eebe79ca094cadb0c9450ae269ba9c2ef3dfba4a0da3a06d2c00deefb02f969a04 SHA512 (ClusterLabs-resource-agents-8ac4daaf.tar.gz) = 2490e0710c46b4e720c370994ab9b9876a95568ebd3e96932fbfbeaafb545d25c6bd25d8b0f89fd81ea28cd7ef963c55b6bed24bc23b370dd63c431ef01fa151