[fence-virt/f17] Add QPid build fix patch from upstream.

[Ryan McCabe]

commit 5d85979fe784edc8592449e596b6e29edcf4bf8b
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Tue Mar 27 11:24:36 2012 -0400

    Add QPid build fix patch from upstream.

 fence-virt.spec  |    7 ++++++-
 qpid-build.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/fence-virt.spec b/fence-virt.spec
index 6a71d9d..f884cf7 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -1,11 +1,12 @@
 Name:		fence-virt
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://fence-virt.sourceforge.net
 Source0:	http://voxel.dl.sourceforge.net/project/fence-virt/%{name}-%{version}.tar.gz
+Patch0: qpid-build.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -83,6 +84,7 @@ to track VMs across multiple hosts.
 
 %prep
 %setup -q
+%patch0 -p1 -b .qpid-build
 
 %build
 ./autogen.sh
@@ -171,6 +173,9 @@ fi
 
 
 %changelog
+* Tue Mar 27 2012 Ryan McCabe <rmccabe at fedoraproject.org> 0.3.0-4
+- Add QPid build fix patch from upstream.
+
 * Tue Feb 28 2012 Lon Hohberger <lon at fedoraproject.org> 0.3.0-3
 - Bump and rebuild
 
diff --git a/qpid-build.patch b/qpid-build.patch
new file mode 100644
index 0000000..76d9d26
--- /dev/null
+++ b/qpid-build.patch
@@ -0,0 +1,22 @@
+commit 2f87331c1aff9e7e7a2757fce6487c47789ec209
+Author: Lon Hohberger <lon at users.sourceforge.net>
+Date:   Mon Mar 26 17:12:49 2012 -0400
+
+    Stop linking against unnecessary QPid libs.
+    
+    Signed-off-by: Lon Hohberger <lon at users.sourceforge.net>
+
+diff --git a/server/Makefile.in b/server/Makefile.in
+index 2c989ed..2bd55ca 100644
+--- a/server/Makefile.in
++++ b/server/Makefile.in
+@@ -27,7 +27,8 @@ PACEMAKER_LIBS=-lcib -lcrmcommon -lpe_status -lplumb \
+ PACEMAKER_INCLUDES=`pkg-config --cflags glib-2.0` -I/usr/include/pacemaker -I/usr/include/heartbeat
+ CMAN_LIBS=-lcman
+ VIRT_LIBS=-lvirt
+-VIRT_QPID=-lqmf2 -lqpidclient -lqpidtypes -lqpidcommon -lqpidmessaging
++VIRT_QPID=-lqmf2
++# No longer needed: -lqpidclient -lqpidtypes -lqpidcommon -lqpidmessaging
+ NSS_LIBS=-lnss3
+ XML_LIBS=`xml2-config --libs`
+ INCLUDES=-I../include `nss-config --cflags` `nspr-config --cflags` `xml2-config --cflags`