[qpid-cpp/f16] BZ747351 - python-qpid-qmf has namespace collision

[Nuno Santos]

commit 86a99cdc6647d0ce995dfd229ca9e15c6a668463
Author: Nuno Santos <nsantos at redhat.com>
Date:   Thu Oct 20 14:21:52 2011 -0400

    BZ747351 - python-qpid-qmf has namespace collision

 qpid-cpp.spec  |    2 ++
 setup_py.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index b3259cb..5a78b8a 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -107,6 +107,7 @@ Source1:        store-%{qpid_release}.%{store_svnrev}.tar.gz
 %if %{fedora}
 Patch0:         configure.patch
 Patch1:         fedora.patch
+Patch2:         setup_py.patch
 %endif
 
 %if %{rhel_4}
@@ -844,6 +845,7 @@ popd
 %if %{fedora}
 %patch0 -p0
 %patch1 -p2
+%patch2 -p0
 %endif
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
diff --git a/setup_py.patch b/setup_py.patch
new file mode 100644
index 0000000..a4ea491
--- /dev/null
+++ b/setup_py.patch
@@ -0,0 +1,34 @@
+--- extras/qmf/setup.py	2011-06-30 10:55:54.000000000 -0400
++++ extras/qmf/setup.py	2011-10-20 13:58:29.786617887 -0400
+@@ -18,6 +18,31 @@
+ # under the License.
+ #
+ from distutils.core import setup
++from distutils.command.install_lib import install_lib as _install_lib
++
++class install_lib(_install_lib):
++
++  def get_outputs(self):
++    outputs = _install_lib.get_outputs(self)
++    extra = []
++    for of in outputs:
++      if os.path.basename(of) == "amqp-0-10-qpid-errata.xml":
++        extra.append(pclfile(of))
++    return outputs + extra
++
++  def install(self):
++    outfiles = _install_lib.install(self)
++    extra = []
++    for of in outfiles:
++      if os.path.basename(of) == "amqp-0-10-qpid-errata.xml":
++        tgt = pclfile(of)
++        if self.force or newer(of, tgt):
++          log.info("caching %s to %s" % (of, os.path.basename(tgt)))
++          if not self.dry_run:
++            from qpid.ops import load_types
++            load_types(of)
++        extra.append(tgt)
++    return outfiles + extra
+ 
+ setup(name="qpid-qmf",
+       version="0.12",