From 1e663fc8b3987c84a0583cb44a9bc1f45683ed27 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 06:43:00 +0000
Subject: [PATCH 01/25] Initialize branch F-12 for resource-agents

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From 6109f86aaf8e5a770e69511bddaf21b75e663c36 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Mon, 12 Oct 2009 16:05:29 +0000
Subject: [PATCH 02/25] Update pacemaker resources from upstream

---
 resource-agents.spec | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/resource-agents.spec b/resource-agents.spec
index d3077cb..9f068cb 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion 2198dc90bec4
+%define altversion 099c0e5d80db
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -138,6 +138,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
 
+%dir %{_sysconfdir}/ha.d
+%{_sysconfdir}/ha.d/shellfuncs
+
 %dir %{_libdir}/heartbeat
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
@@ -155,6 +158,24 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.3-2
+- Update Pacameker agents to upstream version: 099c0e5d80db
+  + Add the ha_parameter function back into .ocf-shellfuncs.
+  + Bug bnc#534803 - Provide a default for MAILCMD
+  + Fix use of undefined macro @HA_NOARCHDATAHBDIR@
+  + High (LF 2138): IPsrcaddr: replace 0/0 with proper ip prefix (thanks to Michael Ricordeau and Michael Schwartzkopff)
+  + Import shellfuncs from heartbeat as badly written RAs use it
+  + Medium (LF 2173): nfsserver: exit properly in nfsserver_validate
+  + Medium: RA: Filesystem: implement monitor operation
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable (addendum)
+  + Medium: RA: iSCSILogicalUnit: use a 16-byte default SCSI ID
+  + Medium: RA: iSCSITarget: be more persistent deleting targets on stop
+  + Medium: RA: portblock: add per-IP filtering capability
+  + Medium: mysql-proxy: log_level and keepalive parameters
+  + Medium: oracle: drop spurious output from sqlplus
+  + RA: Filesystem: allow configuring smbfs mounts as clones
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.3-1
 - New rgmanager resource agents upstream release
 

From 345b66496a5d866b1584bce4bf99d25c174f49b6 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Tue, 13 Oct 2009 09:13:19 +0000
Subject: [PATCH 03/25] Includethe source tarball too

---
 .cvsignore           | 2 +-
 resource-agents.spec | 4 ++--
 sources              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d14b5ac..aaba772 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
+099c0e5d80db.tar.bz2
 resource-agents-3.0.3.tar.gz
-2198dc90bec4.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 9f068cb..5a32da6 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -25,7 +25,7 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,7 +158,7 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
-* Mon Oct 12 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.3-2
+* Mon Oct 12 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.3-3
 - Update Pacameker agents to upstream version: 099c0e5d80db
   + Add the ha_parameter function back into .ocf-shellfuncs.
   + Bug bnc#534803 - Provide a default for MAILCMD
diff --git a/sources b/sources
index 28a5d1b..ef96e8b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
-af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2

From 76475417624576085dee5a9eacf0b0b4a2335adf Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Wed, 21 Oct 2009 11:59:45 +0000
Subject: [PATCH 04/25] New upstream release for rgmanager ras fixes several
 bugs

---
 .cvsignore           | 2 +-
 resource-agents.spec | 7 +++++--
 sources              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index aaba772..26b5360 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 099c0e5d80db.tar.bz2
-resource-agents-3.0.3.tar.gz
+resource-agents-3.0.4.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 5a32da6..b08fe44 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -24,8 +24,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.3
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,6 +158,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.4-1
+- New rgmanager resource agents upstream release
+
 * Mon Oct 12 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.3-3
 - Update Pacameker agents to upstream version: 099c0e5d80db
   + Add the ha_parameter function back into .ocf-shellfuncs.
diff --git a/sources b/sources
index ef96e8b..ce1ef00 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
-91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
+7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz

From c1880d293bed9eb3911ed27dad049583369fe957 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Wed, 28 Oct 2009 12:58:50 +0000
Subject: [PATCH 05/25] Refresh pacemaker agents to ensure IPaddr/IPaddr2 both
 work

---
 .cvsignore           |  2 +-
 resource-agents.spec | 12 ++++++++++--
 sources              |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 26b5360..5bedf4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-099c0e5d80db.tar.bz2
 resource-agents-3.0.4.tar.gz
+e2338892f59f.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index b08fe44..57804f7 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion 099c0e5d80db
+%define altversion e2338892f59f
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.4
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,6 +158,14 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 28 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.4-2
+- Update Pacameker agents to upstream version: e2338892f59f
+  + High: send_arp - turn on unsolicited mode for compatibilty with the libnet version's exit codes
+  + High: Trap sigterm for compatibility with the libnet version of send_arp
+  + Medium: Bug - lf#2147: IPaddr2: behave if the interface is down
+  + Medium: IPv6addr: recognize network masks properly
+  + Medium: RA: VirtualDomain: avoid needlessly invoking "virsh define"
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.4-1
 - New rgmanager resource agents upstream release
 
diff --git a/sources b/sources
index ce1ef00..6b8c56a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz
+f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2

From 6d6973a32bd64ba8a10808b933dc611c0ddd77a0 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Mon, 23 Nov 2009 13:50:44 +0000
Subject: [PATCH 06/25] New upstream release

---
 .cvsignore           | 2 +-
 resource-agents.spec | 7 +++++--
 sources              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5bedf4a..6c8546c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-resource-agents-3.0.4.tar.gz
 e2338892f59f.tar.bz2
+resource-agents-3.0.5.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 57804f7..1a10436 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -24,8 +24,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.4
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.5
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,6 +158,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-1
+- New rgmanager resource agents upstream release
+
 * Wed Oct 28 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.4-2
 - Update Pacameker agents to upstream version: e2338892f59f
   + High: send_arp - turn on unsolicited mode for compatibilty with the libnet version's exit codes
diff --git a/sources b/sources
index 6b8c56a..514340f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz
 f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2
+a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz

From c0a9531dbc47768caaabd7a5a3cf580d7572efa8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:27:57 +0000
Subject: [PATCH 07/25] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f874a5c..1dffbbf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := resource-agents
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 1ca6469e38ffb9e234f572895874ff0640bf68b1 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Mon, 7 Dec 2009 08:29:30 +0000
Subject: [PATCH 08/25] Refresh pacemaker resource agents

---
 .cvsignore           |  2 +-
 resource-agents.spec | 27 +++++++++++++++++++++++++--
 sources              |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6c8546c..38fec36 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-e2338892f59f.tar.bz2
+bc00c0b065d9.tar.bz2
 resource-agents-3.0.5.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index 1a10436..c4c68da 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion e2338892f59f
+%define altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.5
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -37,6 +37,7 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
+BuildRequires: libxslt docbook-style-xsl
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -137,6 +138,7 @@ rm -rf %{buildroot}
 
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
+%{_mandir}/man7/*.7*
 
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
@@ -158,6 +160,27 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.5-2
+- Update Pacameker agents to upstream version: bc00c0b065d9
+  + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)
+  + High: doc: add man pages for all RAs (LF2237)
+  + High: syslog-ng: new RA
+  + High: vmware: make meta-data work and several cleanups (LF 2212)
+  + Medium: .ocf-shellfuncs: add ocf_is_probe function
+  + Medium: Dev: make RAs executable (LF2239)
+  + Medium: IPv6addr: ifdef out the ip offset hack for libnet v1.1.4 (LF 2034)
+  + Medium: add mercurial repository version information to .ocf-shellfuncs
+  + Medium: build: add perl-MailTools runtime dependency to ldirectord package (LF 1469)
+  + Medium: iSCSITarget, iSCSILogicalUnit: support LIO
+  + Medium: nfsserver: use check_binary properly in validate (LF 2211)
+  + Medium: nfsserver: validate should not check if nfs_shared_infodir exists (thanks to eelco@procolix.com) (LF 2219)
+  + Medium: oracle/oralsnr: export variables properly
+  + Medium: pgsql: remove the previous backup_label if it exists
+  + Medium: postfix: fix double stop (thanks to Dinh N. Quoc)
+  + RA: LVM: Make monitor operation quiet in logs (bnc#546353)
+  + RA: Xen: Remove instance_attribute "allow_migrate" (bnc#539968)
+  + ldirectord: OCF agent: overhaul
+
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-1
 - New rgmanager resource agents upstream release
 
diff --git a/sources b/sources
index 514340f..383c404 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2
+8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
 a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz

From 75128198ac063546e5d97934871cf948cf02ee25 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 8 Dec 2009 01:18:55 +0000
Subject: [PATCH 09/25] New upstream release, many bug fixes

---
 .cvsignore           |  2 +-
 resource-agents.spec | 27 +++++++++++++++------------
 sources              |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 38fec36..5152868 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 bc00c0b065d9.tar.bz2
-resource-agents-3.0.5.tar.gz
+resource-agents-3.0.6.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index c4c68da..aa39498 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -10,26 +10,23 @@
 ###############################################################################
 ###############################################################################
 
-# main (empty) package
-# http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
-
 # keep around ready for later user
-## define alphatag rc4
+## global alphatag rc4
 
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
-%define altprefix Cluster-Resource-Agents-
-%define altversion bc00c0b065d9
+%global altprefix Cluster-Resource-Agents-
+%global altversion bc00c0b065d9
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.5
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.6
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: ftp://sources.redhat.com/pub/cluster/releases/resource-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -37,13 +34,12 @@ Requires: bash grep sed gawk
 Requires: net-tools mount e2fsprogs
 
 ## Setup/build bits
-BuildRequires: libxslt docbook-style-xsl
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
+BuildRequires: libxslt docbook-style-xsl
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -78,7 +74,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # building from source directly without those parameters will NOT work.
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
-%setup -q -n resource-agents-%{version}%{?alphatag:.%{alphatag}} -a 1
+%setup -q -n %{name}-%{version} -a 1
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -160,6 +156,13 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-1
+- New rgmanager resource agents upstream release
+- spec file update:
+  * use global instead of define
+  * use new Source0 url
+  * use %name macro more aggressively
+
 * Mon Dec 7 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.5-2
 - Update Pacameker agents to upstream version: bc00c0b065d9
   + High: RA: introduce OCF_FUNCTIONS_DIR, allow it to be overridden (LF2239)
diff --git a/sources b/sources
index 383c404..f6101eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
-a7577975345b865dc73ec0b1c0bd24f7  resource-agents-3.0.5.tar.gz
+12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz

From 5476a94ad514ad73345f301eb71d2fe511aa84a3 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Thu, 11 Feb 2010 09:12:08 +0000
Subject: [PATCH 10/25] New upstream releases Allow pacemaker to use rgmanager
 resource agents

---
 .cvsignore           |  4 ++--
 resource-agents.spec | 29 ++++++++++++++++++++++++++---
 sources              |  4 ++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5152868..3eef4b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-bc00c0b065d9.tar.bz2
-resource-agents-3.0.6.tar.gz
+c76b4a6eb576.tar.bz2
+resource-agents-3.0.7.tar.gz
diff --git a/resource-agents.spec b/resource-agents.spec
index aa39498..bd5c2ea 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,12 +17,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion bc00c0b065d9
+%global altversion c76b4a6eb576
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.6
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.7
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -40,6 +40,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
+BuildRequires: python
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -109,6 +110,10 @@ find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
 chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
 chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
+# symlink to allow pacemaker to use rgmanager RAs
+cd %{buildroot}/usr/lib/ocf/resource.d/ && \
+ ln -sf %{_datadir}/cluster/ redhat
+
 %clean
 rm -rf %{buildroot}
 
@@ -129,6 +134,7 @@ rm -rf %{buildroot}
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 /usr/lib/ocf/resource.d/heartbeat
+/usr/lib/ocf/resource.d/redhat
 %{_sbindir}/ocf-tester
 %{_sbindir}/sfex_init
 
@@ -156,6 +162,22 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Fri Jan 15 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-2
+- Add python as BuildRequires
+
+* Mon Jan 11 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#526286, rhbz#533461
+
+* Mon Jan 11 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.6-2
+- Update Pacameker agents to upstream version: c76b4a6eb576
+  + High: RA: VirtualDomain: fix forceful stop (LF 2283)
+  + High: apache: monitor operation of depth 10 for web applications (LF 2234)
+  + Medium: IPaddr2: CLUSTERIP/iptables rule not always inserted on failed monitor (LF 2281)
+  + Medium: RA: Route: improve validate (LF 2232)
+  + Medium: mark obsolete RAs as deprecated (LF 2244)
+  + Medium: mysql: escalate stop to KILL if regular shutdown doesn't work
+
 * Mon Dec 7 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.6-1
 - New rgmanager resource agents upstream release
 - spec file update:
@@ -186,6 +208,7 @@ rm -rf %{buildroot}
 
 * Fri Nov 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.5-1
 - New rgmanager resource agents upstream release
+- Allow pacemaker to use rgmanager resource agents
 
 * Wed Oct 28 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.4-2
 - Update Pacameker agents to upstream version: e2338892f59f
diff --git a/sources b/sources
index f6101eb..d9f7dc5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8c659c6c25cf7f29eae98e22b00d388f  bc00c0b065d9.tar.bz2
-12e059b8d7b1a05a161161bb9662b38b  resource-agents-3.0.6.tar.gz
+560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
+497d03f8ff8f48c76cdec9e3e469b077  resource-agents-3.0.7.tar.gz

From c9d0535db93eec9f4cb640be176700128b7e33dd Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 03:03:34 +0000
Subject: [PATCH 11/25] Initialize branch F-13 for resource-agents

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 07c877f4f6301a1eb6d02a4effbab48627d9c37f Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 23 Feb 2010 09:55:23 +0000
Subject: [PATCH 12/25] New upstream release

---
 .cvsignore           |  2 +-
 resource-agents.spec | 21 +++++++++++++++++----
 sources              |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3eef4b5..4930af6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.7.tar.gz
+resource-agents-3.0.8.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index bd5c2ea..46b5066 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2009 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2010 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -21,12 +21,12 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.7
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.8
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -162,6 +162,19 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Feb 22 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.8-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#548133, rhbz#565907, rhbz#545602, rhbz#555901
+  Resolves: rhbz#564471, rhbz#515717, rhbz#557128, rhbz#536157
+  Resolves: rhbz#455300, rhbz#561416, rhbz#562237, rhbz#537201
+  Resolves: rhbz#536962, rhbz#553383, rhbz#556961, rhbz#555363
+  Resolves: rhbz#557128, rhbz#455300, rhbz#557167, rhbz#459630
+  Resolves: rhbz#532808, rhbz#556603, rhbz#554968, rhbz#555047
+  Resolves: rhbz#554968, rhbz#555047
+- spec file update:
+  * update spec file copyright date
+  * use bz2 tarball
+
 * Fri Jan 15 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-2
 - Add python as BuildRequires
 
diff --git a/sources b/sources
index d9f7dc5..9f758d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-497d03f8ff8f48c76cdec9e3e469b077  resource-agents-3.0.7.tar.gz
+fdd75bbc966489da769d8151428535e4  resource-agents-3.0.8.tar.bz2

From 826f04cb44d7fd549ff9bedfe1ee1be78a536553 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 23 Feb 2010 13:13:27 +0000
Subject: [PATCH 13/25] New upstream release

---
 .cvsignore           |  2 +-
 resource-agents.spec | 21 +++++++++++++++++----
 sources              |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3eef4b5..4930af6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.7.tar.gz
+resource-agents-3.0.8.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index bd5c2ea..46b5066 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2009 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2010 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -21,12 +21,12 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.7
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.8
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.gz
+Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
@@ -162,6 +162,19 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Feb 22 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.8-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#548133, rhbz#565907, rhbz#545602, rhbz#555901
+  Resolves: rhbz#564471, rhbz#515717, rhbz#557128, rhbz#536157
+  Resolves: rhbz#455300, rhbz#561416, rhbz#562237, rhbz#537201
+  Resolves: rhbz#536962, rhbz#553383, rhbz#556961, rhbz#555363
+  Resolves: rhbz#557128, rhbz#455300, rhbz#557167, rhbz#459630
+  Resolves: rhbz#532808, rhbz#556603, rhbz#554968, rhbz#555047
+  Resolves: rhbz#554968, rhbz#555047
+- spec file update:
+  * update spec file copyright date
+  * use bz2 tarball
+
 * Fri Jan 15 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.7-2
 - Add python as BuildRequires
 
diff --git a/sources b/sources
index d9f7dc5..9f758d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-497d03f8ff8f48c76cdec9e3e469b077  resource-agents-3.0.7.tar.gz
+fdd75bbc966489da769d8151428535e4  resource-agents-3.0.8.tar.bz2

From df0bf5f5982d9135b8b5b60cdb9c5d4522e0a810 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 2 Mar 2010 10:13:48 +0000
Subject: [PATCH 14/25] New rgmanager resource agents upstream release
 Resolves: rhbz#455300,     rhbz#568446, rhbz#561862, rhbz#536902 Resolves:
 rhbz#512171,     rhbz#519491

---
 .cvsignore           | 2 +-
 resource-agents.spec | 7 ++++++-
 sources              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4930af6..c07faa8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.8.tar.bz2
+resource-agents-3.0.9.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 46b5066..ff10d32 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,7 +21,7 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.8
+Version: 3.0.9
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -162,6 +162,11 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Mar  1 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.9-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#455300, rhbz#568446, rhbz#561862, rhbz#536902
+  Resolves: rhbz#512171, rhbz#519491
+
 * Mon Feb 22 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.8-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#548133, rhbz#565907, rhbz#545602, rhbz#555901
diff --git a/sources b/sources
index 9f758d0..7634ba5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-fdd75bbc966489da769d8151428535e4  resource-agents-3.0.8.tar.bz2
+e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2

From 2c5f441a04d7f5e4971854506d4713c00120be03 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 2 Mar 2010 10:36:55 +0000
Subject: [PATCH 15/25] New rgmanager resource agents upstream release
 Resolves: rhbz#455300,     rhbz#568446, rhbz#561862, rhbz#536902 Resolves:
 rhbz#512171,     rhbz#519491

---
 .cvsignore           | 2 +-
 resource-agents.spec | 7 ++++++-
 sources              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4930af6..c07faa8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.8.tar.bz2
+resource-agents-3.0.9.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 46b5066..ff10d32 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,7 +21,7 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.8
+Version: 3.0.9
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -162,6 +162,11 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Mar  1 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.9-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#455300, rhbz#568446, rhbz#561862, rhbz#536902
+  Resolves: rhbz#512171, rhbz#519491
+
 * Mon Feb 22 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.8-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#548133, rhbz#565907, rhbz#545602, rhbz#555901
diff --git a/sources b/sources
index 9f758d0..7634ba5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-fdd75bbc966489da769d8151428535e4  resource-agents-3.0.8.tar.bz2
+e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2

From d22003b7a89004fb342a3f30acc59a0067001606 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Wed, 24 Mar 2010 16:29:58 +0000
Subject: [PATCH 16/25] Resolve rhbz#574732 and 572993

---
 .cvsignore           |  1 +
 resource-agents.spec | 10 ++++++++--
 sources              |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c07faa8..8741512 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 c76b4a6eb576.tar.bz2
 resource-agents-3.0.9.tar.bz2
+ldirectord-man.patch
diff --git a/resource-agents.spec b/resource-agents.spec
index ff10d32..9b8db76 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -22,12 +22,13 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.9
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
+Patch1: ldirectord-man.patch
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -40,7 +41,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
-BuildRequires: python
+BuildRequires: python perl libnet-devel
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -76,6 +77,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
 %setup -q -n %{name}-%{version} -a 1
+%patch1 -p0
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -162,6 +164,10 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Mar 24 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.9-2
+- Resolves: rhbz#572993 - Patched build process to correctly generate ldirectord man page
+- Resolves: rhbz#574732 - Add libnet-devel as a dependancy to ensure IPaddrv6 is built
+
 * Mon Mar  1 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.9-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#455300, rhbz#568446, rhbz#561862, rhbz#536902
diff --git a/sources b/sources
index 7634ba5..ef9b31f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
 e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2
+6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch

From d0a3d1c07fc0192b6d491ac5b9149e5fdd29f576 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Wed, 24 Mar 2010 20:38:34 +0000
Subject: [PATCH 17/25] Forward port update from F-12

---
 .cvsignore           |  1 +
 resource-agents.spec | 10 ++++++++--
 sources              |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c07faa8..8741512 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 c76b4a6eb576.tar.bz2
 resource-agents-3.0.9.tar.bz2
+ldirectord-man.patch
diff --git a/resource-agents.spec b/resource-agents.spec
index ff10d32..9b8db76 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -22,12 +22,13 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.9
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
+Patch1: ldirectord-man.patch
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -40,7 +41,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
-BuildRequires: python
+BuildRequires: python perl libnet-devel
 
 %description
 A set of scripts to interface with several services to operate in a
@@ -76,6 +77,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
 %setup -q -n %{name}-%{version} -a 1
+%patch1 -p0
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -162,6 +164,10 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Mar 24 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.9-2
+- Resolves: rhbz#572993 - Patched build process to correctly generate ldirectord man page
+- Resolves: rhbz#574732 - Add libnet-devel as a dependancy to ensure IPaddrv6 is built
+
 * Mon Mar  1 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.9-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#455300, rhbz#568446, rhbz#561862, rhbz#536902
diff --git a/sources b/sources
index 7634ba5..ef9b31f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
 e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2
+6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch

From d002864641b090a6ae974a41961cca843c8cfbf7 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Mon, 12 Apr 2010 04:22:15 +0000
Subject: [PATCH 18/25] New upstream release, fixes several bugs

---
 .cvsignore           |  2 +-
 resource-agents.spec | 13 +++++++++++--
 sources              |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8741512..11e2535 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.9.tar.bz2
+resource-agents-3.0.10.tar.bz2
 ldirectord-man.patch
diff --git a/resource-agents.spec b/resource-agents.spec
index 9b8db76..d0019e8 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,8 +21,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.9
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.10
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -164,6 +164,15 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Fri Apr  9 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.10-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#519491, rhbz#570525, rhbz#571806, rhbz#574027
+  Resolves: rhbz#574215, rhbz#574886, rhbz#576322, rhbz#576335
+  Resolves: rhbz#575103, rhbz#577856, rhbz#577874, rhbz#578249
+  Resolves: rhbz#578625, rhbz#578626, rhbz#578628, rhbz#578626
+  Resolves: rhbz#579621, rhbz#579623, rhbz#579625, rhbz#579626
+  Resolves: rhbz#579059
+
 * Wed Mar 24 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.9-2
 - Resolves: rhbz#572993 - Patched build process to correctly generate ldirectord man page
 - Resolves: rhbz#574732 - Add libnet-devel as a dependancy to ensure IPaddrv6 is built
diff --git a/sources b/sources
index ef9b31f..2a82414 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2
+3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
 6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch

From 8c97b2c4bcd8ee6566b6cac8b49ff5d5525af174 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Mon, 12 Apr 2010 04:22:48 +0000
Subject: [PATCH 19/25] New upstream release, fixes several bugs

---
 .cvsignore           |  2 +-
 resource-agents.spec | 13 +++++++++++--
 sources              |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8741512..11e2535 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 c76b4a6eb576.tar.bz2
-resource-agents-3.0.9.tar.bz2
+resource-agents-3.0.10.tar.bz2
 ldirectord-man.patch
diff --git a/resource-agents.spec b/resource-agents.spec
index 9b8db76..d0019e8 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,8 +21,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.9
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.10
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -164,6 +164,15 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Fri Apr  9 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.10-1
+- New rgmanager resource agents upstream release
+  Resolves: rhbz#519491, rhbz#570525, rhbz#571806, rhbz#574027
+  Resolves: rhbz#574215, rhbz#574886, rhbz#576322, rhbz#576335
+  Resolves: rhbz#575103, rhbz#577856, rhbz#577874, rhbz#578249
+  Resolves: rhbz#578625, rhbz#578626, rhbz#578628, rhbz#578626
+  Resolves: rhbz#579621, rhbz#579623, rhbz#579625, rhbz#579626
+  Resolves: rhbz#579059
+
 * Wed Mar 24 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.9-2
 - Resolves: rhbz#572993 - Patched build process to correctly generate ldirectord man page
 - Resolves: rhbz#574732 - Add libnet-devel as a dependancy to ensure IPaddrv6 is built
diff --git a/sources b/sources
index ef9b31f..2a82414 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
-e75e1a1e01cb40d5ffad52adef78c1cb  resource-agents-3.0.9.tar.bz2
+3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
 6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch

From 7ec93fbf9da6fd8f50accb3ce7d8c76815aeb79b Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Sat, 17 Apr 2010 08:45:19 +0000
Subject: [PATCH 20/25] Update with new linux-ha upstream release

---
 .cvsignore           |  3 +--
 resource-agents.spec | 42 ++++++++++++++++++++++++++++++++++++------
 sources              |  3 +--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 11e2535..82f077c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-c76b4a6eb576.tar.bz2
 resource-agents-3.0.10.tar.bz2
-ldirectord-man.patch
+agents-1.0.3.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index d0019e8..8f9ab6a 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,18 +17,17 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion c76b4a6eb576
+%global altversion agents-1.0.3
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.10
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
-Patch1: ldirectord-man.patch
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -77,7 +76,6 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
 %setup -q -n %{name}-%{version} -a 1
-%patch1 -p0
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -96,8 +94,7 @@ cd %{altprefix}%{altversion}
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 # %{_smp_mflags} is broken from upstream and unrequired for this project.
 CFLAGS="$(echo '%{optflags}')" make -C rgmanager/src/resources
-cd %{altprefix}%{altversion}
-make %{_smp_mflags}
+make -C %{altprefix}%{altversion} %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -112,6 +109,13 @@ find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
 chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
 chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
+# Strange location, remove until we can confirm
+rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
+
+# Test harness, worth creating a devel package for?
+rm -rf %{buildroot}%{_datadir}/resource-agents/ocft
+rm -f  %{buildroot}%{_sbindir}/ocft
+
 # symlink to allow pacemaker to use rgmanager RAs
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
@@ -164,6 +168,32 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Sat Apr 17 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.10-2
+- New pacemaker agents upstream release
+  + High: RA: vmware: fix set_environment() invocation (LF 2342)
+  + High: RA: vmware: update to version 0.2
+  + Medium: Filesystem: prefer /proc/mounts to /etc/mtab for non-bind mounts (lf#2388)
+  + Medium: IPaddr2: don't bring the interface down on stop (thanks to Lars Ellenberg)
+  + Medium: IPsrcaddr: modify the interface route (lf#2367)
+  + Medium: ldirectord: Allow multiple email addresses (LF 2168)
+  + Medium: ldirectord: fix setting defaults for configfile and ldirectord (lf#2328)
+  + Medium: meta-data: improve timeouts in most resource agents
+  + Medium: nfsserver: use default values (lf#2321)
+  + Medium: ocf-shellfuncs: don't log but print to stderr if connected to a terminal
+  + Medium: ocf-shellfuncs: don't output to stderr if using syslog
+  + Medium: oracle/oralsnr: improve exit codes if the environment isn't valid
+  + Medium: RA: iSCSILogicalUnit: fix monitor for STGT
+  + Medium: RA: make sure that OCF_RESKEY_CRM_meta_interval is always defined (LF 2284)
+  + Medium: RA: ManageRAID: require bash
+  + Medium: RA: ManageRAID: require bash
+  + Medium: RA: VirtualDomain: bail out early if config file can't be read during probe (Novell 593988)
+  + Medium: RA: VirtualDomain: fix incorrect use of __OCF_ACTION
+  + Medium: RA: VirtualDomain: improve error messages
+  + Medium: RA: VirtualDomain: spin on define until we definitely have a domain name
+  + Medium: Route: add route table parameter (lf#2335)
+  + Medium: sfex: don't use pid file (lf#2363,bnc#585416)
+  + Medium: sfex: exit with success on stop if sfex has never been started (bnc#585416)
+
 * Fri Apr  9 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.10-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#519491, rhbz#570525, rhbz#571806, rhbz#574027
diff --git a/sources b/sources
index 2a82414..049ebed 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
 3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
-6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch
+fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2

From 9986497544115188723c51b796da67f0a2b346f2 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Sat, 17 Apr 2010 08:55:43 +0000
Subject: [PATCH 21/25] Update with new linux-ha upstream release

---
 .cvsignore           |  3 +--
 resource-agents.spec | 42 ++++++++++++++++++++++++++++++++++++------
 sources              |  3 +--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 11e2535..82f077c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-c76b4a6eb576.tar.bz2
 resource-agents-3.0.10.tar.bz2
-ldirectord-man.patch
+agents-1.0.3.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index d0019e8..8f9ab6a 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,18 +17,17 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion c76b4a6eb576
+%global altversion agents-1.0.3
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.10
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
-Patch1: ldirectord-man.patch
 
 ## Runtime deps
 Requires: bash grep sed gawk
@@ -77,7 +76,6 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %prep
 %setup -q -n %{name}-%{version} -a 1
-%patch1 -p0
 
 # prepare rgmanager RAs
 %{_configure} \
@@ -96,8 +94,7 @@ cd %{altprefix}%{altversion}
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 # %{_smp_mflags} is broken from upstream and unrequired for this project.
 CFLAGS="$(echo '%{optflags}')" make -C rgmanager/src/resources
-cd %{altprefix}%{altversion}
-make %{_smp_mflags}
+make -C %{altprefix}%{altversion} %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -112,6 +109,13 @@ find %{buildroot} -type f -name '*.dtd' -exec chmod 644 {} \;
 chmod 755 %{buildroot}/%{_sbindir}/ocf-tester
 chmod 755 %{buildroot}/%{_datadir}/cluster/ocf-shellfuncs
 
+# Strange location, remove until we can confirm
+rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
+
+# Test harness, worth creating a devel package for?
+rm -rf %{buildroot}%{_datadir}/resource-agents/ocft
+rm -f  %{buildroot}%{_sbindir}/ocft
+
 # symlink to allow pacemaker to use rgmanager RAs
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
@@ -164,6 +168,32 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Sat Apr 17 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.10-2
+- New pacemaker agents upstream release
+  + High: RA: vmware: fix set_environment() invocation (LF 2342)
+  + High: RA: vmware: update to version 0.2
+  + Medium: Filesystem: prefer /proc/mounts to /etc/mtab for non-bind mounts (lf#2388)
+  + Medium: IPaddr2: don't bring the interface down on stop (thanks to Lars Ellenberg)
+  + Medium: IPsrcaddr: modify the interface route (lf#2367)
+  + Medium: ldirectord: Allow multiple email addresses (LF 2168)
+  + Medium: ldirectord: fix setting defaults for configfile and ldirectord (lf#2328)
+  + Medium: meta-data: improve timeouts in most resource agents
+  + Medium: nfsserver: use default values (lf#2321)
+  + Medium: ocf-shellfuncs: don't log but print to stderr if connected to a terminal
+  + Medium: ocf-shellfuncs: don't output to stderr if using syslog
+  + Medium: oracle/oralsnr: improve exit codes if the environment isn't valid
+  + Medium: RA: iSCSILogicalUnit: fix monitor for STGT
+  + Medium: RA: make sure that OCF_RESKEY_CRM_meta_interval is always defined (LF 2284)
+  + Medium: RA: ManageRAID: require bash
+  + Medium: RA: ManageRAID: require bash
+  + Medium: RA: VirtualDomain: bail out early if config file can't be read during probe (Novell 593988)
+  + Medium: RA: VirtualDomain: fix incorrect use of __OCF_ACTION
+  + Medium: RA: VirtualDomain: improve error messages
+  + Medium: RA: VirtualDomain: spin on define until we definitely have a domain name
+  + Medium: Route: add route table parameter (lf#2335)
+  + Medium: sfex: don't use pid file (lf#2363,bnc#585416)
+  + Medium: sfex: exit with success on stop if sfex has never been started (bnc#585416)
+
 * Fri Apr  9 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.10-1
 - New rgmanager resource agents upstream release
   Resolves: rhbz#519491, rhbz#570525, rhbz#571806, rhbz#574027
diff --git a/sources b/sources
index 2a82414..049ebed 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-560e687fa108dbe90e4fae0772ea6e66  c76b4a6eb576.tar.bz2
 3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
-6d7d6f53cfc0099759b7171db69d8b21  ldirectord-man.patch
+fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2

From 94eb8d9aa94cb1b8cdbddf8bfe6e68709635796d Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 25 May 2010 10:25:09 +0000
Subject: [PATCH 22/25] New upstream release

---
 .cvsignore           |  4 +--
 resource-agents.spec | 86 ++++++++++++++++++++++++++++++++++++++++----
 sources              |  4 +--
 3 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 82f077c..958cd29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-resource-agents-3.0.10.tar.bz2
-agents-1.0.3.tar.bz2
+a7c0f35916bf.tar.bz2
+resource-agents-3.0.12.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 8f9ab6a..6307265 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,11 +17,11 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion agents-1.0.3
+%global altversion a7c0f35916bf
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.10
+Version: 3.0.12
 Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -30,8 +30,28 @@ Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
-Requires: bash grep sed gawk
-Requires: net-tools mount e2fsprogs
+# system tools shared by several agents
+Requires: /bin/bash /bin/grep /bin/sed /bin/gawk
+Requires: /bin/ps /usr/bin/pkill /bin/hostname
+Requires: /sbin/fuser
+Requires: /sbin/findfs /bin/mount
+
+# fs.sh
+Requires: /sbin/quotaon /sbin/quotacheck
+Requires: /sbin/fsck
+Requires: /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4
+Requires: /sbin/fsck.xfs
+
+# ip.sh
+Requires: /sbin/ip /usr/sbin/ethtool
+Requires: /sbin/rdisc /usr/sbin/arping /bin/ping /bin/ping6
+
+# lvm.sh
+Requires: /sbin/lvm
+
+# netfs.sh
+Requires: /sbin/mount.nfs /sbin/mount.nfs4 /sbin/mount.cifs
+Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
 
 ## Setup/build bits
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -40,13 +60,18 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
-BuildRequires: python perl libnet-devel
+BuildRequires: python perl 
+
+%if 0%{?rhel} == 0
+BuildRequires: libnet-devel
+%endif
 
 %description
 A set of scripts to interface with several services to operate in a
 High Availability environment for both Pacemaker and rgmanager
 service managers.
 
+%if 0%{?rhel} == 0
 %package -n ldirectord
 Summary:          Monitor daemon for maintaining high availability resources
 Group:            System Environment/Daemons
@@ -70,6 +95,7 @@ ldirectord is a stand-alone daemon to monitor services of real
 for virtual services provided by The Linux Virtual Server
 (http://www.linuxvirtualserver.org/). It is simple to install 
 and works with the heartbeat code (http://www.linux-ha.org/).
+%endif
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -88,7 +114,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
 ./autogen.sh
-%{configure} --enable-fatal-warnings=no
+%{configure} --enable-fatal-warnings=no --with-rsctmpdir=%{_var}/run/heartbeat/rsctmp
 
 %build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -116,6 +142,12 @@ rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
 rm -rf %{buildroot}%{_datadir}/resource-agents/ocft
 rm -f  %{buildroot}%{_sbindir}/ocft
 
+%if 0%{?rhel} != 0
+# ldirectord isn't included on RHEL
+find %{buildroot} -name 'ldirectord.*' -exec rm -f {} \;
+find %{buildroot} -name 'ldirectord' -exec rm -f {} \;
+%endif
+
 # symlink to allow pacemaker to use rgmanager RAs
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
@@ -123,6 +155,7 @@ cd %{buildroot}/usr/lib/ocf/resource.d/ && \
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?rhel} == 0
 %post -n ldirectord
 /sbin/chkconfig --add ldirectord
 
@@ -130,6 +163,7 @@ rm -rf %{buildroot}
 
 %preun -n ldirectord
 /sbin/chkconfig --del ldirectord
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -155,7 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
 %{_libdir}/heartbeat/sfex_daemon
+%{_includedir}/heartbeat/agent_config.h
 
+%if 0%{?rhel} == 0
 %files -n ldirectord
 %defattr(-,root,root,-)
 %doc %{altprefix}%{altversion}/COPYING 
@@ -166,8 +202,46 @@ rm -rf %{buildroot}
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_mandir}/man8/ldirectord.8*
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
+%endif
 
 %changelog
+* Tue May 18 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-2
+- libnet is not available on RHEL
+- Do not package ldirectord on RHEL
+  Resolves: rhbz#577264
+
+* Mon May 10 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.12-1
+- new upstream release
+  Resolves: rhbz#585217, rhbz#586100, rhbz#581533, rhbz#582753
+  Resolves: rhbz#582754, rhbz#585083, rhbz#587079, rhbz#588890
+  Resolves: rhbz#588925, rhbz#583789, rhbz#589131, rhbz#588010
+  Resolves: rhbz#576871, rhbz#576871, rhbz#590000, rhbz#589823
+
+* Mon May 10 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-1
+- New pacemaker agents upstream release: a7c0f35916bf
+  + High: pgsql: properly implement pghost parameter
+  + High: RA: mysql: fix syntax error
+  + High: SAPInstance RA: do not rely on op target rc when monitoring clones (lf#2371)
+  + High: set the HA_RSCTMP directory to /var/run/resource-agents (lf#2378)
+  + Medium: IPaddr/IPaddr2: add a description of the assumption in meta-data
+  + Medium: IPaddr: return the correct code if interface delete failed
+  + Medium: nfsserver: rpc.statd as the notify cmd does not work with -v (thanks to Carl Lewis)
+  + Medium: oracle: reduce output from sqlplus to the last line for queries (bnc#567815)
+  + Medium: pgsql: implement "config" parameter
+  + Medium: RA: iSCSITarget: follow changed IET access policy
+
+* Wed Apr 21 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.11-1
+- new upstream release
+  Resolves: rhbz#583945, rhbz#581047, rhbz#576330, rhbz#583017
+  Resolves: rhbz#583019, rhbz#583948, rhbz#584003, rhbz#582017
+  Resolves: rhbz#555901, rhbz#582754, rhbz#582573, rhbz#581533
+- Switch to file based Requires.
+  Also address several other problems related to missing runtime
+  components in different agents.
+  With the current Requires: set, we guarantee all basic functionalities
+  out of the box for lvm/fs/clusterfs/netfs/networking.
+  Resolves: rhbz#570008
+
 * Sat Apr 17 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.10-2
 - New pacemaker agents upstream release
   + High: RA: vmware: fix set_environment() invocation (LF 2342)
diff --git a/sources b/sources
index 049ebed..3583373 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
-fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2
+47b99d289954bd9e3da382c8919f9386  a7c0f35916bf.tar.bz2
+88c983731f8ed9f6fd02d20ec697ebc8  resource-agents-3.0.12.tar.bz2

From 6b0a5882f6e11c25d2607fe19888748eacfa0430 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 25 May 2010 10:25:19 +0000
Subject: [PATCH 23/25] New upstream release

---
 .cvsignore           |  4 +--
 resource-agents.spec | 86 ++++++++++++++++++++++++++++++++++++++++----
 sources              |  4 +--
 3 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 82f077c..958cd29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-resource-agents-3.0.10.tar.bz2
-agents-1.0.3.tar.bz2
+a7c0f35916bf.tar.bz2
+resource-agents-3.0.12.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 8f9ab6a..6307265 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -17,11 +17,11 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %global altprefix Cluster-Resource-Agents-
-%global altversion agents-1.0.3
+%global altversion a7c0f35916bf
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.10
+Version: 3.0.12
 Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -30,8 +30,28 @@ Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz
 Source1: http://hg.linux-ha.org/agents/archive/%{altversion}.tar.bz2
 
 ## Runtime deps
-Requires: bash grep sed gawk
-Requires: net-tools mount e2fsprogs
+# system tools shared by several agents
+Requires: /bin/bash /bin/grep /bin/sed /bin/gawk
+Requires: /bin/ps /usr/bin/pkill /bin/hostname
+Requires: /sbin/fuser
+Requires: /sbin/findfs /bin/mount
+
+# fs.sh
+Requires: /sbin/quotaon /sbin/quotacheck
+Requires: /sbin/fsck
+Requires: /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4
+Requires: /sbin/fsck.xfs
+
+# ip.sh
+Requires: /sbin/ip /usr/sbin/ethtool
+Requires: /sbin/rdisc /usr/sbin/arping /bin/ping /bin/ping6
+
+# lvm.sh
+Requires: /sbin/lvm
+
+# netfs.sh
+Requires: /sbin/mount.nfs /sbin/mount.nfs4 /sbin/mount.cifs
+Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
 
 ## Setup/build bits
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -40,13 +60,18 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cluster-glue-libs-devel glib2-devel
 BuildRequires: automake autoconf pkgconfig
 BuildRequires: libxslt docbook-style-xsl
-BuildRequires: python perl libnet-devel
+BuildRequires: python perl 
+
+%if 0%{?rhel} == 0
+BuildRequires: libnet-devel
+%endif
 
 %description
 A set of scripts to interface with several services to operate in a
 High Availability environment for both Pacemaker and rgmanager
 service managers.
 
+%if 0%{?rhel} == 0
 %package -n ldirectord
 Summary:          Monitor daemon for maintaining high availability resources
 Group:            System Environment/Daemons
@@ -70,6 +95,7 @@ ldirectord is a stand-alone daemon to monitor services of real
 for virtual services provided by The Linux Virtual Server
 (http://www.linuxvirtualserver.org/). It is simple to install 
 and works with the heartbeat code (http://www.linux-ha.org/).
+%endif
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -88,7 +114,7 @@ and works with the heartbeat code (http://www.linux-ha.org/).
 # prepare pacemaker RAs
 cd %{altprefix}%{altversion}
 ./autogen.sh
-%{configure} --enable-fatal-warnings=no
+%{configure} --enable-fatal-warnings=no --with-rsctmpdir=%{_var}/run/heartbeat/rsctmp
 
 %build
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -116,6 +142,12 @@ rm -f %{buildroot}%{_libdir}/heartbeat/tickle_tcp
 rm -rf %{buildroot}%{_datadir}/resource-agents/ocft
 rm -f  %{buildroot}%{_sbindir}/ocft
 
+%if 0%{?rhel} != 0
+# ldirectord isn't included on RHEL
+find %{buildroot} -name 'ldirectord.*' -exec rm -f {} \;
+find %{buildroot} -name 'ldirectord' -exec rm -f {} \;
+%endif
+
 # symlink to allow pacemaker to use rgmanager RAs
 cd %{buildroot}/usr/lib/ocf/resource.d/ && \
  ln -sf %{_datadir}/cluster/ redhat
@@ -123,6 +155,7 @@ cd %{buildroot}/usr/lib/ocf/resource.d/ && \
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?rhel} == 0
 %post -n ldirectord
 /sbin/chkconfig --add ldirectord
 
@@ -130,6 +163,7 @@ rm -rf %{buildroot}
 
 %preun -n ldirectord
 /sbin/chkconfig --del ldirectord
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -155,7 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
 %{_libdir}/heartbeat/sfex_daemon
+%{_includedir}/heartbeat/agent_config.h
 
+%if 0%{?rhel} == 0
 %files -n ldirectord
 %defattr(-,root,root,-)
 %doc %{altprefix}%{altversion}/COPYING 
@@ -166,8 +202,46 @@ rm -rf %{buildroot}
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_mandir}/man8/ldirectord.8*
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
+%endif
 
 %changelog
+* Tue May 18 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-2
+- libnet is not available on RHEL
+- Do not package ldirectord on RHEL
+  Resolves: rhbz#577264
+
+* Mon May 10 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.12-1
+- new upstream release
+  Resolves: rhbz#585217, rhbz#586100, rhbz#581533, rhbz#582753
+  Resolves: rhbz#582754, rhbz#585083, rhbz#587079, rhbz#588890
+  Resolves: rhbz#588925, rhbz#583789, rhbz#589131, rhbz#588010
+  Resolves: rhbz#576871, rhbz#576871, rhbz#590000, rhbz#589823
+
+* Mon May 10 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-1
+- New pacemaker agents upstream release: a7c0f35916bf
+  + High: pgsql: properly implement pghost parameter
+  + High: RA: mysql: fix syntax error
+  + High: SAPInstance RA: do not rely on op target rc when monitoring clones (lf#2371)
+  + High: set the HA_RSCTMP directory to /var/run/resource-agents (lf#2378)
+  + Medium: IPaddr/IPaddr2: add a description of the assumption in meta-data
+  + Medium: IPaddr: return the correct code if interface delete failed
+  + Medium: nfsserver: rpc.statd as the notify cmd does not work with -v (thanks to Carl Lewis)
+  + Medium: oracle: reduce output from sqlplus to the last line for queries (bnc#567815)
+  + Medium: pgsql: implement "config" parameter
+  + Medium: RA: iSCSITarget: follow changed IET access policy
+
+* Wed Apr 21 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.11-1
+- new upstream release
+  Resolves: rhbz#583945, rhbz#581047, rhbz#576330, rhbz#583017
+  Resolves: rhbz#583019, rhbz#583948, rhbz#584003, rhbz#582017
+  Resolves: rhbz#555901, rhbz#582754, rhbz#582573, rhbz#581533
+- Switch to file based Requires.
+  Also address several other problems related to missing runtime
+  components in different agents.
+  With the current Requires: set, we guarantee all basic functionalities
+  out of the box for lvm/fs/clusterfs/netfs/networking.
+  Resolves: rhbz#570008
+
 * Sat Apr 17 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.10-2
 - New pacemaker agents upstream release
   + High: RA: vmware: fix set_environment() invocation (LF 2342)
diff --git a/sources b/sources
index 049ebed..3583373 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
-fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2
+47b99d289954bd9e3da382c8919f9386  a7c0f35916bf.tar.bz2
+88c983731f8ed9f6fd02d20ec697ebc8  resource-agents-3.0.12.tar.bz2

From b24ad234f7e5c2078d36f4cba0efac3de5cf445a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 11:26:38 +0000
Subject: [PATCH 24/25] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1dffbbf..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: resource-agents
-# $Id$
-NAME := resource-agents
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13
diff --git a/import.log b/import.log
deleted file mode 100644
index a7a2bf5..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-resource-agents-3_0_0-3_alpha5_fc11:HEAD:resource-agents-3.0.0-3.alpha5.fc11.src.rpm:1235478910

From fbb5c8470076ea0a4ec43b8b597952c15314a420 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 11:26:39 +0000
Subject: [PATCH 25/25] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1dffbbf..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: resource-agents
-# $Id$
-NAME := resource-agents
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12
diff --git a/import.log b/import.log
deleted file mode 100644
index a7a2bf5..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-resource-agents-3_0_0-3_alpha5_fc11:HEAD:resource-agents-3.0.0-3.alpha5.fc11.src.rpm:1235478910