Rebase to resource-agents 3.9.7 upstream release.

This commit is contained in:
Oyvind Albrigtsen 2016-02-08 17:03:11 +01:00
parent 3ec8f6be0e
commit 1d299fd67d

View File

@ -36,7 +36,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 3.9.7
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}
@ -45,6 +45,7 @@ Group: System Environment/Base
Group: Productivity/Clustering/HA
%endif
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
Patch1: fix-non-executable-script-errors.patch
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@ -152,6 +153,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
exit 1
%endif
%setup -q -n %{upstream_prefix}-%{upstream_version}
%autopatch -p1
%build
if [ ! -f configure ]; then
@ -247,8 +249,8 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ocft/README
%{_datadir}/%{name}/ocft/README.zh_CN
%{_datadir}/%{name}/ocft/helpers.sh
%{_datadir}/%{name}/ocft/runocft
%{_datadir}/%{name}/ocft/runocft.prereq
%exclude %{_datadir}/%{name}/ocft/runocft
%exclude %{_datadir}/%{name}/ocft/runocft.prereq
%{_sbindir}/ocf-tester
%{_sbindir}/ocft
@ -257,8 +259,6 @@ rm -rf %{buildroot}
%{_includedir}/heartbeat
%dir %attr (1755, root, root) %{_var}/run/resource-agents
%{_mandir}/man7/*.7*
%{_mandir}/man8/ocf-tester.8*
#%{_mandir}/man8/sfex_init.8*
@ -327,7 +327,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif
%changelog
* Mon Feb 8 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.9.7-1
* Mon Feb 8 2016 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.9.7-2
- Rebase to resource-agents 3.9.7 upstream release.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.6-2.2