[python-qpid] Add qmf-related files

[Nuno Santos]

commit 4ed93f5fbb8fc2b2b481dacee178e8bfcb2579dc
Author: Nuno Santos <nsantos at redhat.com>
Date:   Tue Jan 11 18:32:48 2011 -0500

    Add qmf-related files

 .gitignore                                         |    1 +
 0001-BZ-597066.patch                               |   31 -
 ...Fixed-connection.start-hangs-if-connectio.patch |   28 -
 ...Fixed-qpid-python-high-level-API-clients-.patch |   82 -
 ...dded-back-values-method-for-backwards-com.patch |   39 -
 0005-BZ-567249-fix-for-python-2.3.patch            |   31 -
 ...erformance-tweaks-for-receive-added-confi.patch |  136 -
 ...817-don-t-always-set-the-sync-bit-on-send.patch |  136 -
 ...eset-reconnect-delay-after-successful-con.patch |   25 -
 ...dded-full-support-for-unreliable-at-least.patch |  205 --
 ...dded-optional-timeouts-to-connection-sess.patch |  333 ---
 ...dded-support-for-x-amqp-0-10.-app-id-cont.patch |  102 -
 ...ake-sure-we-initialize-properties-even-if.patch |   26 -
 ...ix-timeout-tests-to-not-leave-queues-lyin.patch |   26 -
 ...dd-uuid-prefix-to-addresses-beginning-wit.patch |   46 -
 ...-fix-mangling-for-addresses-that-are-None.patch |   26 -
 0016-BZ-608807-fixed-concurrent-close.patch        |  472 ---
 ...Z-609258-added-accessor-for-auth_username.patch |   63 -
 0018-BZ-609258-fixed-auth-username-for-sasl.patch  |   30 -
 ...Assertion-when-raising-a-link-established.patch |   59 -
 ...-convert-ttl-from-seconds-to-milliseconds.patch |   74 -
 ...ixed-payload-of-None-for-text-plain-messa.patch |   58 -
 0022-removed-old-python-examples.patch             | 3137 --------------------
 ...ixed-missign-import-and-added-test-case-f.patch |   78 -
 ...liminate-spurious-error-logging-and-recon.patch |   51 -
 ...ixed-parsing-of-failover-URLs-fixed-drive.patch |   98 -
 ...Z-614344-default-ports-for-reconnect_urls.patch |   37 -
 ...ixed-bug-in-flow-control-logic-added-test.patch |  154 -
 0028-BZ-621998-fixed-heartbeating.patch            |  160 -
 ...ditional-assignment-to-vanilla-if-then-el.patch |   36 -
 ...ally-Python-before-2.5-did-not-allow-fina.patch |   39 -
 ...ManagementTest.test_broker_connectivity_o.patch |   59 -
 0032-BZ-621527-default-sasl-service-to-qpidd.patch |   27 -
 ...ix-error-reporting-for-negotiation-failur.patch |   43 -
 0034-BZ-624714-fixed-reply-to-conversion.patch     |   79 -
 ...Python-Qpid-does-not-properly-encode-bool.patch |   56 -
 ...ade-qpid.datatypes-module-use-builtin-UUI.patch |  106 -
 ...-assertion-to-check-that-deletion-of-defa.patch |   25 -
 0038-handle-request-timeout.patch                  |   28 -
 ...h-to-not-hang-on-session-error-fixed-the-.patch |   63 -
 python-qpid.spec                                   |   16 +-
 sources                                            |    1 +
 42 files changed, 17 insertions(+), 6305 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ca5a43..04c1b61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 python-qpid-0.7.946106.tar.gz
 /qpid-python-0.8.tar.gz
+/qpid-extras-0.8.tar.gz
diff --git a/python-qpid.spec b/python-qpid.spec
index 01ba86c..d5b3fc1 100644
--- a/python-qpid.spec
+++ b/python-qpid.spec
@@ -3,7 +3,7 @@
 
 Name:           python-qpid
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python client library for AMQP
 
 Group:          Development/Python
@@ -11,6 +11,7 @@ License:        ASL 2.0
 URL:            http://qpid.apache.org
 Source0:        qpid-python-%{version}.tar.gz
 # http://archive.apache.org/dist/qpid/0.8/qpid-python-0.8.tar.gz
+Source1:        qpid-extras-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -21,14 +22,22 @@ BuildRequires:  python-devel
 The Apache Qpid Python client library for AMQP.
 
 %prep
+%setup -q -D -b 1 -n qpid-%{version}/extras
 %setup -q -n qpid-%{version}/python
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+pushd ../extras/qmf
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+pushd ../extras/qmf
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT/%{python_sitelib}/qmf2
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -37,14 +46,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitelib}/mllib
 %{python_sitelib}/qpid
+%{python_sitelib}/qmf
 %{_bindir}/qpid-python-test
 %doc LICENSE.txt NOTICE.txt README.txt examples/
 
 %if "%{python_version}" >= "2.6"
 %{python_sitelib}/qpid_python-*.egg-info
+%{python_sitelib}/qpid_qmf-*.egg-info
 %endif
 
 %changelog
+* Tue Jan 11 2011 Nuno Santos <nsantos at redhat.com> - 0.8-2
+- Add qmf-related files
+
 * Tue Jan 11 2011 Nuno Santos <nsantos at redhat.com> - 0.8-1
 - Rebased to sync with upstream's official 0.8 release, based on svn rev 1037942
 
diff --git a/sources b/sources
index e02dc22..c4914f0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 61aecab8f49b494631ddb4ad97089d25  qpid-python-0.8.tar.gz
+93d280756928e360007d9cf652c6dec3  qpid-extras-0.8.tar.gz