[python-txzmq] Patch to support older pyzmq.
Ralph Bean
ralph at fedoraproject.org
Mon Oct 29 15:22:11 UTC 2012
commit 9d4ad574001a54d25b7cb21fad5bb6d0c698bccf
Author: Ralph Bean <rbean at redhat.com>
Date: Mon Oct 29 11:21:37 2012 -0400
Patch to support older pyzmq.
0002-Support-older-pyzmq.patch | 25 +++++++++++++++++++++++++
python-txzmq.spec | 7 ++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0002-Support-older-pyzmq.patch b/0002-Support-older-pyzmq.patch
new file mode 100644
index 0000000..865c39d
--- /dev/null
+++ b/0002-Support-older-pyzmq.patch
@@ -0,0 +1,25 @@
+From ec162da4e2a611d2776873cf91e075626d034f8e Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Mon, 29 Oct 2012 11:20:01 -0400
+Subject: [PATCH] Support older pyzmq.
+
+---
+ txzmq/connection.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/txzmq/connection.py b/txzmq/connection.py
+index 0458758..827e0b3 100644
+--- a/txzmq/connection.py
++++ b/txzmq/connection.py
+@@ -16,7 +16,7 @@ from twisted.python import log
+ try:
+ from zmq.core import version
+
+- ZMQ3 = version.zmq_version_info()[0] >= 3
++ ZMQ3 = int(version.zmq_version().split('.')[0]) >= 3
+ except ImportError:
+ ZMQ3 = False
+
+--
+1.7.12.1
+
diff --git a/python-txzmq.spec b/python-txzmq.spec
index 7387f31..53d19da 100644
--- a/python-txzmq.spec
+++ b/python-txzmq.spec
@@ -2,7 +2,7 @@
Name: python-txzmq
Version: 0.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Twisted bindings for ZeroMQ
Group: Development/Languages
@@ -10,6 +10,7 @@ License: GPLv2
URL: http://pypi.python.org/pypi/%{modname}
Source0: http://pypi.python.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz
Patch0: 0001-Disable-epgm-test.patch
+Patch0: 0002-Support-older-pyzmq.patch
BuildArch: noarch
@@ -30,6 +31,7 @@ Twisted event loop (reactor).
%prep
%setup -q -n %{modname}-%{version}
%patch0 -p1 -b .disable_epgm_test
+%patch1 -p1 -b .disable-older-pyzmq
# Patch out the setuptools requirement on Twisted since epel doesn't ship
# twisted egg-info
@@ -53,6 +55,9 @@ PYTHONPATH=$(pwd) nosetests
%{python_sitelib}/*
%changelog
+* Mon Oct 29 2012 Ralph Bean <rbean at redhat.com> - 0.6.1-2
+- Patch (again) to support older pyzmq on f17 and el6.
+
* Mon Oct 29 2012 Ralph Bean <rbean at redhat.com> - 0.6.1-1
- Upstream integrates zeromq3 support. Dropping patches.
More information about the scm-commits
mailing list