[libvirt-qpid/f14] Fix parallel make & missing library link flag

[Daniel P. Berrange]

commit f8e9e4caf420a9f4437a4e2e8a8ebbd6556c7630
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Fri May 6 11:43:54 2011 +0100

    Fix parallel make & missing library link flag

 libvirt-qpid-0.2.22-parallel-make.patch  |   37 ++++++++++++++++++++++++++++++
 libvirt-qpid-0.2.22-qpidtypes-link.patch |   21 +++++++++++++++++
 libvirt-qpid.spec                        |   10 +++++++-
 3 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/libvirt-qpid-0.2.22-parallel-make.patch b/libvirt-qpid-0.2.22-parallel-make.patch
new file mode 100644
index 0000000..c591f64
--- /dev/null
+++ b/libvirt-qpid-0.2.22-parallel-make.patch
@@ -0,0 +1,37 @@
+commit a22da2c8485063d046c497b50b04f37e24bab052
+Author: Daniel P. Berrange <berrange at redhat.com>
+Date:   Fri Feb 11 15:27:03 2011 +0000
+
+    Fix parallel make with qmf-gen
+    
+    Each 'qmf-gen' invocation generates all required files, so
+    it must only be run once. When doing a parallel build make
+    will run it many times. Introduce a dummy timestamp file
+    to ensure its only run once
+    
+    * src/Makefile.am: Fix parallel make
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ef41016..c8dc2d2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,13 +38,15 @@ libvirt_qpid_SOURCES = \
+ 	Error.h \
+ 	NodeWrap.h \
+ 	PoolWrap.h \
+-	VolumeWrap.h 
++	VolumeWrap.h
+ 
+-$(generated_file_list): libvirt-schema.xml
+-	qmf-gen -o ./qmf ./libvirt-schema.xml
++$(generated_file_list): .libvirt-schema.xml.tstamp
++
++.libvirt-schema.xml.tstamp: libvirt-schema.xml
++	qmf-gen -o ./qmf $< && touch $@ || rm -f $@
+ 
+ BUILT_SOURCES = $(generated_file_list)
+-CLEANFILES = $(generated_file_list)
++CLEANFILES = $(generated_file_list) .libvirt-schema.xml.tstamp
+ 
+ libvirt_qpid_LDADD = -lqmf -lqpidcommon -lqpidclient -lvirt $(XML_LIBS)
+ 
diff --git a/libvirt-qpid-0.2.22-qpidtypes-link.patch b/libvirt-qpid-0.2.22-qpidtypes-link.patch
new file mode 100644
index 0000000..81713ae
--- /dev/null
+++ b/libvirt-qpid-0.2.22-qpidtypes-link.patch
@@ -0,0 +1,21 @@
+commit 266b3f727209dadd7f7e8b27511194b3b59bc31b
+Author: Daniel P. Berrange <berrange at redhat.com>
+Date:   Mon Apr 4 17:44:49 2011 +0100
+
+    Add missing linkage to libqpidtypes.so
+    
+    * src/Makefile.am: Add -lqpidtypes
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c8dc2d2..1b4ef23 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -48,7 +48,7 @@ $(generated_file_list): .libvirt-schema.xml.tstamp
+ BUILT_SOURCES = $(generated_file_list)
+ CLEANFILES = $(generated_file_list) .libvirt-schema.xml.tstamp
+ 
+-libvirt_qpid_LDADD = -lqmf -lqpidcommon -lqpidclient -lvirt $(XML_LIBS)
++libvirt_qpid_LDADD = -lqmf -lqpidtypes -lqpidcommon -lqpidclient -lvirt $(XML_LIBS)
+ 
+ dist_pkgdata_DATA = libvirt-schema.xml
+ 
diff --git a/libvirt-qpid.spec b/libvirt-qpid.spec
index 0cf8da2..6098356 100644
--- a/libvirt-qpid.spec
+++ b/libvirt-qpid.spec
@@ -2,7 +2,9 @@ Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
 Version: 0.2.22
 Release: 3%{?dist}
-Source: libvirt-qpid-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
+Patch1: %{name}-%{version}-parallel-make.patch
+Patch2: %{name}-%{version}-qpidtypes-link.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
 Group: Applications/System
@@ -32,6 +34,8 @@ a set of objects with properties and methods.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -74,6 +78,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu May  5 2011 Daniel P. Berrange <berrange at redhat.com> - 0.2.22-3
+- Add fix for parallel make race condition
+- Add missing qpidtypes link flag
+
+* Thu May  5 2011 Daniel P. Berrange <berrange at redhat.com>
 - Rebuild for QPid soname change
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.22-2