Accepting request 163866 from devel:languages:python3

- Change suggests to recommends since suggests are not well supported
- Disable simplejson on openSUSE <= 12.2 since it is not supported

OBS-URL: https://build.opensuse.org/request/show/163866
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=77

accept-newer-amqp-versions.diff

@@ -0,0 +1,31 @@
+Index: kombu.egg-info/requires.txt
+===================================================================
+--- kombu.egg-info/requires.txt.orig
++++ kombu.egg-info/requires.txt
+@@ -1,2 +1,2 @@
+ anyjson>=0.3.3
+-amqp>=1.0.10,<1.1.0
+\ No newline at end of file
++amqp>=1.0.10
+\ No newline at end of file
+Index: requirements/default.txt
+===================================================================
+--- requirements/default.txt.orig
++++ requirements/default.txt
+@@ -1,2 +1,2 @@
+ anyjson>=0.3.3
+-amqp>=1.0.10,<1.1.0
++amqp>=1.0.10
+Index: setup.cfg
+===================================================================
+--- setup.cfg.orig
++++ setup.cfg
+@@ -28,7 +28,7 @@ upload-dir = docs/.build/html
+ 
+ [bdist_rpm]
+ requires = anyjson >= 0.3.3
+-	amqp < 1.1.0
++	amqp >= 1.0.9
+ 	importlib
+ 	ordereddict
+ 

python-kombu.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Apr 13 10:17:23 UTC 2013 - toddrme2178@gmail.com
+
+- Changes suggests to recommends since suggets are not well supported
+
 -------------------------------------------------------------------
 Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br
 

python-kombu.spec

@@ -40,9 +40,9 @@ Requires:       python-anyjson >= 0.3.3
 Requires:       python-importlib
 Requires:       python-ordereddict
 %endif
-Suggests:       couchdb
+Recommends:     couchdb
-Suggests:       mongodb
+Recommends:     mongodb
-Suggests:       rabbitmq-server
+Recommends:     rabbitmq-server
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

python3-kombu.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br
+
+- Update to 2.5.10:
+  Kombu 3 consumers will no longer accept pickle/yaml or msgpack
+  by default, and you will have to explicitly enable untrusted deserializers
+  either globally using kombu.enable_insecure_serializers, or
+  using the accept argument to kombu.Consumer.
+  - New utility function to disable/enable untrusted serializers.
+    - kombu.disable_insecure_serializers
+    - kombu.enable_insecure_serializers
+  - Consumer: `accept` can now be used to specify a whitelist
+    of content types to accept.
+    If the accept whitelist is set and a message is received
+    with a content type that is not in the whitelist then a
+    :exc:`~kombu.exceptions.ContentDisallowed` exception
+    is raised.  Note that this error can be handled by the already
+    existing `on_decode_error` callback
+    Examples:
+        Consumer(accept=['application/json'])
+        Consumer(accept=['pickle', 'json'])
+  - Now depends on amqp 1.0.11
+  - pidbox: Mailbox now supports the `accept` argument.
+  - Redis: More friendly error for when keys are missing.
+  - Connection URLs: The parser did not work well when there were
+    multiple '+' tokens.
+
+-------------------------------------------------------------------
+Fri Apr 12 12:06:17 UTC 2013 - toddrme2178@gmail.com
+
+- Change suggests to recommends since suggests are not well supported
+- Disable simplejson on openSUSE <= 12.2 since it is not supported
+
 -------------------------------------------------------------------
 Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br
 

python3-kombu.spec

@@ -33,13 +33,15 @@ BuildRequires:  python3-distribute
 BuildRequires:  python3-mock
 BuildRequires:  python3-msgpack-python
 BuildRequires:  python3-nose-cover3
+%if 0%{?suse_version} >= 1230 
 BuildRequires:  python3-simplejson
+%endif
 BuildRequires:  python3-unittest2
 Requires:       python3-amqp >= 1.0.11
 Requires:       python3-anyjson
-Suggests:       couchdb
+Recommends:     couchdb
-Suggests:       mongodb
+Recommends:     mongodb
-Suggests:       rabbitmq-server
+Recommends:     rabbitmq-server
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -56,7 +58,7 @@ providing an idiomatic high-level interface for the AMQP protocol, and also
 provide proven and tested solutions to common messaging problems.
 
 %prep
-%patch0
+%setup -q -n kombu-%{version}
 # For rpmlint warning: remove shebang from python library:
 sed -i '/^#!/d' ./kombu/tests/test_serialization.py