New upstream release

.cvsignore

@@ -1,2 +1,2 @@
-resource-agents-3.0.10.tar.bz2
+a7c0f35916bf.tar.bz2
-agents-1.0.3.tar.bz2
+resource-agents-3.0.12.tar.bz2

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
+# system tools shared by several agents
-Requires: net-tools mount e2fsprogs
+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)

sources

@@ -1,2 +1,2 @@
-3a33ab67b82efd8673fb4101f010b154  resource-agents-3.0.10.tar.bz2
+47b99d289954bd9e3da382c8919f9386  a7c0f35916bf.tar.bz2
-fcaa2cfd83a28d1965200e11db2ddd41  agents-1.0.3.tar.bz2
+88c983731f8ed9f6fd02d20ec697ebc8  resource-agents-3.0.12.tar.bz2