diff --git a/accept-newer-amqp-versions.diff b/accept-newer-amqp-versions.diff new file mode 100644 index 0000000..02a50cb --- /dev/null +++ b/accept-newer-amqp-versions.diff @@ -0,0 +1,24 @@ +--- kombu.egg-info/requires.txt ++++ kombu.egg-info/requires.txt +@@ -1,2 +1,2 @@ + anyjson>=0.3.3 +-amqp>=1.0.8,<1.1.0 +\ Kein Zeilenumbruch am Dateiende. ++amqp>=1.0.8 +--- requirements/default.txt ++++ requirements/default.txt +@@ -1,2 +1,2 @@ + anyjson>=0.3.3 +-amqp>=1.0.8,<1.1.0 ++amqp>=1.0.8 +--- setup.cfg ++++ setup.cfg +@@ -28,7 +28,7 @@ + + [bdist_rpm] + requires = anyjson >= 0.3.3 +- amqp < 1.1.0 ++ amqp >= 1.0.8 + importlib + ordereddict + diff --git a/python-kombu.changes b/python-kombu.changes index 07968fd..b9324db 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 12 13:27:34 UTC 2013 - dmueller@suse.com + +- Add accept-newer-amqp-versions.diff: + * Also accept amqp versions >= 1.1.0 + ------------------------------------------------------------------- Fri Feb 8 20:12:27 UTC 2013 - alexandre@exatati.com.br diff --git a/python-kombu.spec b/python-kombu.spec index a8bffce..9d06c39 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -1,7 +1,7 @@ # # spec file for package python-kombu # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,28 +11,30 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-kombu Version: 2.5.6 Release: 0 -License: BSD-3-Clause Summary: AMQP Messaging Framework for Python -Url: http://github.com/ask/kombu/ +License: BSD-3-Clause Group: Development/Languages/Python +Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -BuildRequires: python-devel +Patch0: accept-newer-amqp-versions.diff +BuildRequires: python-PyYAML BuildRequires: python-amqplib BuildRequires: python-anyjson +BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-mock BuildRequires: python-msgpack-python BuildRequires: python-nose-cover3 BuildRequires: python-simplejson BuildRequires: python-unittest2 >= 0.5.0 -BuildRequires: python-PyYAML Requires: python-amqp >= 1.0.8 Requires: python-anyjson >= 0.3.3 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -63,6 +65,7 @@ provide proven and tested solutions to common messaging problems. %prep %setup -q -n kombu-%{version} +%patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py # NOTE(saschpe): We have a newer python-amqp, but this shouldn't be an issue: diff --git a/python3-kombu.spec b/python3-kombu.spec index 53b485e..f3015dc 100644 --- a/python3-kombu.spec +++ b/python3-kombu.spec @@ -11,29 +11,31 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-kombu Version: 2.5.6 Release: 0 -License: BSD-2-Clause Summary: AMQP Messaging Framework for Python -Url: http://github.com/ask/kombu/ +License: BSD-2-Clause Group: Development/Languages/Python +Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz +Patch0: accept-newer-amqp-versions.diff BuildRequires: python3 -BuildRequires: python3-devel -BuildRequires: python3-distribute +BuildRequires: python3-PyYAML BuildRequires: python3-amqplib BuildRequires: python3-anyjson +BuildRequires: python3-devel +BuildRequires: python3-distribute BuildRequires: python3-mock BuildRequires: python3-msgpack-python BuildRequires: python3-nose-cover3 BuildRequires: python3-simplejson BuildRequires: python3-unittest2 -BuildRequires: python3-PyYAML Requires: python3-amqp >= 1.0.8 Requires: python3-anyjson Suggests: couchdb @@ -56,6 +58,7 @@ provide proven and tested solutions to common messaging problems. %prep %setup -q -n kombu-%{version} +%patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py