[resource-agents] Merges redhat provider into heartbeat provider for pacemaker support
David Vossel
dvossel at fedoraproject.org
Tue Jun 18 20:39:35 UTC 2013
commit ce546be6ad725c341182b8cb7ca6718bfb20a4cd
Author: David Vossel <dvossel at redhat.com>
Date: Tue Jun 18 15:35:47 2013 -0500
Merges redhat provider into heartbeat provider for pacemaker support
Resolves: rhbz#917681
Resolves: rhbz#928890
Resolves: rhbz#952716
Resolves: rhbz#960555
.gitignore | 1 +
no-cluster-glue.patch | 13 --------
resource-agents.spec | 26 +++++++++++-----
rhbz915959-apache-resource-pidfile-path.patch | 39 -------------------------
sources | 2 +-
5 files changed, 20 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e6f880..6ea09aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ resource-agents-3.0.14.tar.bz2
/resource-agents-3.9.1.tar.bz2
/resource-agents-3.9.2.tar.bz2
/resource-agents-3.9.5.tar.gz
+/ClusterLabs-resource-agents-5434e96.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 7a7d7ee..8155a52 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -19,6 +19,9 @@
# use the correct group for each.
#
+%global upstream_prefix ClusterLabs-resource-agents
+%global upstream_version 5434e96
+
# SSLeay (required by ldirectord)
%if 0%{?suse_version}
%global SSLeay perl-Net_SSLeay
@@ -33,17 +36,15 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 3.9.5
-Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release: 5
License: GPLv2+ and LGPLv2+
-URL: http://to.be.defined.com/
+URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
Group: System Environment/Base
%else
Group: Productivity/Clustering/HA
%endif
-Source0: %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz
-Patch0: no-cluster-glue.patch
-Patch1: rhbz915959-apache-resource-pidfile-path.patch
+Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@@ -146,9 +147,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
%{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.}
exit 1
%endif
-%setup -q -n %{name}-%{version}%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{upstream_prefix}-%{upstream_version}
%build
if [ ! -f configure ]; then
@@ -157,6 +156,7 @@ fi
%if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
CFLAGS="$(echo '%{optflags}')"
+# TODO make this rsctmp folder the same as upstream
%global conf_opt_rsctmpdir "--with-rsctmpdir=%{_var}/run/heartbeat/rsctmp"
%global conf_opt_fatal "--enable-fatal-warnings=no"
%else
@@ -250,6 +250,7 @@ rm -rf %{buildroot}
%{_includedir}/heartbeat
+# TODO make this rsctmp folder the same as upstream
%if 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
%dir %{_var}/run/heartbeat/rsctmp
%else
@@ -307,6 +308,15 @@ ccs_update_schema > /dev/null 2>&1 ||:
%endif
%changelog
+* Tue Jun 18 2013 David Vossel <dvossel at redhat.com> - 3.9.5-5
+- Merges redhat provider into heartbeat provider. Remove
+ rgmanager's redhat provider.
+
+ Resolves: rhbz#917681
+ Resolves: rhbz#928890
+ Resolves: rhbz#952716
+ Resolves: rhbz#960555
+
* Tue Mar 12 2013 David Vossel <dvossel at redhat.com> - 3.9.5-3
- Fixes build system error with conditional logic involving
IPv6addr and updates spec file to build against rhel 7 as
diff --git a/sources b/sources
index 03d6879..a2d6195 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7a2b2bd1e5a87142d1757439406d57c resource-agents-3.9.5.tar.gz
+278507aa2aeaf2b90ddb5b7206d0100f ClusterLabs-resource-agents-5434e96.tar.gz
More information about the scm-commits
mailing list