From d22003b7a89004fb342a3f30acc59a0067001606 Mon Sep 17 00:00:00 2001 From: Andrew Beekhof Date: Wed, 24 Mar 2010 16:29:58 +0000 Subject: [PATCH] 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 - 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 - 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