From f6dce7576d4500f352f32f11c3ae02b264569c5a Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@matthias-runge.de>
Date: Aug 03 2012 06:25:33 +0000
Subject: update to 2.3.2


---

diff --git a/.gitignore b/.gitignore
index 9ecae0e..6d40120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kombu-1.1.3.tar.gz
+/kombu-2.3.2.tar.gz
diff --git a/python-kombu.spec b/python-kombu.spec
index 440dd69..f1b175a 100644
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -1,8 +1,14 @@
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 0
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%endif
+
 %global srcname kombu
 
 Name:           python-%{srcname}
-Version:        1.1.3
-Release:        3%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        AMQP Messaging Framework for Python
 
 Group:          Development/Languages
@@ -13,11 +19,26 @@ Source0:        http://pypi.python.org/packages/source/k/%{srcname}/%{srcname}-%
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-nose
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-anyjson
+%endif # if with_python3
+
 BuildRequires:  python-setuptools
 BuildRequires:  python-nose
 BuildRequires:  python-anyjson
 BuildRequires:  python-amqplib
-BuildRequires:  python-msgpack
+
+# required for tests:
+BuildRequires: python-nose-cover3
+BuildRequires: python-unittest2
+BuildRequires: python-coverage
+BuildRequires: python-mock
+BuildRequires: python-simplejson
+BuildRequires: PyYAML
+BuildRequires: python-msgpack
 # For documentation
 #BuildRequires:  pymongo python-sphinx
 #This causes tests error, needs fixing upstream. Incompatible with python > 2.7
@@ -33,19 +54,54 @@ The aim of Kombu is to make messaging in Python as easy as possible by
 providing an idiomatic high-level interface for the AMQP protocol, and
 also provide proven and tested solutions to common messaging problems.
 
+%if 0%{?with_python3}
+%package -n python3-kombu
+Summary:        AMQP Messaging Framework for Python3
+Group:          Development/Languages
+
+Requires:       python3
+
+%description -n python3-kombu
+AMQP is the Advanced Message Queuing Protocol, an open standard protocol
+for message orientation, queuing, routing, reliability and security.
+
+One of the most popular implementations of AMQP is RabbitMQ.
+
+The aim of Kombu is to make messaging in Python as easy as possible by
+providing an idiomatic high-level interface for the AMQP protocol, and
+also provide proven and tested solutions to common messaging problems.
+
+This subpackage is for python3
+%endif # with_python3
+
 %prep
 %setup -q -n %{srcname}-%{version}
-# Remove shehang
-sed -i -e '/^#!\//, 1d' kombu/tests/test_serialization.py
-# Remove hidden files
-rm -rf docs/.static
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif
+
 
 %build
 %{__python} setup.py build
 
+# build python3-kombu
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+%endif # with_python3
+
+
 # Documentation in docs folder is not useful without doing a make
 # Seems to have a circular dependency.  Not building for now
 #cd docs && make html
@@ -53,16 +109,33 @@ rm -rf docs/.static
 #rm -rf docs
 #rm -f htmldocs/.buildinfo
 
-%%check
-#cd %%{srcname}/tests
-#nosetests *.py
+%check
+%{__python} setup.py test
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif # with_python3
 
 %files
 %doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/
 %{python_sitelib}/%{srcname}/
 %{python_sitelib}/%{srcname}*.egg-info
 
+%if 0%{?with_python3}
+%files -n python3-kombu
+%doc AUTHORS Changelog FAQ LICENSE READ* THANKS TODO examples/
+%{python3_sitelib}/*
+%endif # with_python3
+
+
 %changelog
+* Wed Aug 03 2012 Matthias Runge <mrunge@matthias-runge.de> - 2.3.2-1
+- update to version 2.3.2
+- enable tests
+- require python2 and/or python3
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 2c9d2c3..1b35d28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d9d15058454ae2d1f6212cedb1efbc9  kombu-1.1.3.tar.gz
+e421f7c4ba4ad483bcf0171910abecb5  kombu-2.3.2.tar.gz