From 2d8e1d4b5846904088b83d102684ae76dd25ea3a Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Apr 17 2010 08:27:22 +0000
Subject: Update with new linux-ha upstream release


---

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