[python-qpid/f14/master] Rebased to sync with upstream's official 0.8 release, based on svn rev 1037942

Mon Feb 14 16:50:52 UTC 2011

commit 56a90a8ccaf6ec8c6ddef718231ec7ae47a36fff
Author: Nuno Santos <nsantos at redhat.com>
Date:   Mon Feb 14 11:50:34 2011 -0500

    Rebased to sync with upstream's official 0.8 release, based on svn rev 1037942

 .gitignore       |    2 +
 python-qpid.spec |   84 +++++++++++++----------------------------------------
 sources          |    3 +-
 3 files changed, 25 insertions(+), 64 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index de8cde3..e659adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 python-qpid-0.7.946106.tar.gz
+/qpid-extras-0.8.tar.gz
+/qpid-python-0.8.tar.gz
diff --git a/python-qpid.spec b/python-qpid.spec
index d98c48b..e4b84fb 100644
--- a/python-qpid.spec
+++ b/python-qpid.spec
@@ -2,44 +2,16 @@
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
 Name:           python-qpid
-Version:        0.7.946106
-Release:        11%{?dist}
+Version:        0.8
+Release:        2%{?dist}
 Summary:        Python client library for AMQP
 
 Group:          Development/Python
 License:        ASL 2.0
 URL:            http://qpid.apache.org
-Source0:        %{name}-%{version}.tar.gz
-# svn export -r<rev> http://svn.apache.org/repos/asf/qpid/trunk/qpid/python python-qpid-0.7.<rev>
-# tar czf python-qpid-0.7.<rev>.tar.gz python-qpid-0.7.<rev>
-
-Patch0:         0001-BZ-597066.patch
-Patch1:         0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
-Patch2:         0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
-Patch3:         0004-BZ-567249-added-back-values-method-for-backwards-com.patch
-Patch4:         0005-BZ-567249-fix-for-python-2.3.patch
-Patch5:         0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
-Patch6:         0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
-Patch7:         0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
-Patch8:         0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
-Patch9:         0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
-Patch10:        0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
-Patch11:        0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
-Patch12:        0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
-Patch13:        0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
-Patch14:        0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
-Patch15:        0016-BZ-608807-fixed-concurrent-close.patch
-Patch16:        0017-BZ-609258-added-accessor-for-auth_username.patch
-Patch17:        0018-BZ-609258-fixed-auth-username-for-sasl.patch
-Patch18:        0019-Bug-611543-Assertion-when-raising-a-link-established.patch
-Patch19:        0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
-Patch20:        0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
-Patch21:        0022-removed-old-python-examples.patch
-Patch22:        0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
-Patch23:        0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
-Patch24:        0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
-Patch25:        0026-BZ-614344-default-ports-for-reconnect_urls.patch
-Patch26:        0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
+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
@@ -50,41 +22,22 @@ BuildRequires:  python-devel
 The Apache Qpid Python client library for AMQP.
 
 %prep
-%setup -q
-%patch0 -p3
-%patch1 -p3
-%patch2 -p3
-%patch3 -p3
-%patch4 -p3
-%patch5 -p3
-%patch6 -p3
-%patch7 -p3
-%patch8 -p3
-%patch9 -p3
-%patch10 -p3
-%patch11 -p3
-%patch12 -p3
-%patch13 -p3
-%patch14 -p3
-%patch15 -p3
-%patch16 -p3
-%patch17 -p3
-%patch18 -p3
-%patch19 -p3
-%patch20 -p3
-%patch21 -p3
-%patch22 -p3
-%patch23 -p3
-%patch24 -p3
-%patch25 -p3
-%patch26 -p3
+%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
@@ -93,16 +46,21 @@ 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
-* Mon Aug  2 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-11
-- Fix for bz620402
+* Mon Feb 14 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
 
 * Wed Jul 14 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-9
 - Fix for bz614344
diff --git a/sources b/sources
index 1feebd2..4df083c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-fa538004b09900578a7dac9159997c1d  python-qpid-0.7.946106.tar.gz
+93d280756928e360007d9cf652c6dec3  qpid-extras-0.8.tar.gz
+61aecab8f49b494631ddb4ad97089d25  qpid-python-0.8.tar.gz
