From 1d299fd67d99330ac8a8d6fa1f25907e0d195108 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 8 Feb 2016 17:03:11 +0100 Subject: [PATCH] Rebase to resource-agents 3.9.7 upstream release. --- resource-agents.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index 9df0b41..8f2a6e7 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -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 - 3.9.7-1 +* Mon Feb 8 2016 Oyvind Albrigtsen - 3.9.7-2 - Rebase to resource-agents 3.9.7 upstream release. * Thu Feb 04 2016 Fedora Release Engineering - 3.9.6-2.2