From 0743c382193ef798d9412f72efc0add4389dc21c Mon Sep 17 00:00:00 2001
From: Thomas Spura <thomas.spura@gmail.com>
Date: Aug 28 2014 20:54:27 +0000
Subject: update to 14.3.1 (#1134571)


---

diff --git a/.gitignore b/.gitignore
index e833506..6d5f8eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@
 /pyzmq-2.1.9.tar.gz
 /pyzmq-2.1.11.tar.gz
 /pyzmq-2.2.0.tar.gz
+/pyzmq-2.2.0.1.tar.gz
+/pyzmq-13.0.0.tar.gz
+/pyzmq-13.0.2.tar.gz
+/pyzmq-14.3.1.tar.gz
diff --git a/python-zmq-os-walk.patch b/python-zmq-os-walk.patch
deleted file mode 100644
index 34929e5..0000000
--- a/python-zmq-os-walk.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 12bca65badafebf0d45864b2011c32543be271d4
-Author: Thomas Spura <tomspur@fedoraproject.org>
-Date:   Tue Aug 3 12:56:54 2010 +0200
-
-    s/os.path.walk/os.walk/g in python 3
-    
-    When running python3, there is no os.path.walk() anymore.
-    It's renamed as os.walk(), so prefer the later and fall back to the
-    first.
-    
-    Signed-off-by: Thomas Spura <tomspur@fedoraproject.org>
-
-diff --git a/setup.py b/setup.py
-index 6c765a6..2fe9055 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,12 @@ from distutils.extension import Extension
- 
- from unittest import TextTestRunner, TestLoader
- from glob import glob
--from os.path import splitext, basename, join as pjoin, walk
-+from os.path import splitext, basename, join as pjoin
-+
-+try:
-+    from os import walk
-+except ImportError:
-+    from os.path import walk
- 
- 
- #-----------------------------------------------------------------------------
diff --git a/python-zmq.spec b/python-zmq.spec
index e72d9d6..6e7dd8f 100644
--- a/python-zmq.spec
+++ b/python-zmq.spec
@@ -18,24 +18,27 @@
 %global run_tests 1
 
 Name:           python-zmq
-Version:        2.2.0.1
+Version:        14.3.1
 Release:        1%{?dist}
 Summary:        Software library for fast, message-based applications
 
 Group:          Development/Libraries
-License:        LGPLv3+ and ASL 2.0
+License:        LGPLv3+ and ASL 2.0 and BSD
 URL:            http://www.zeromq.org/bindings:python
 # VCS:          git:http://github.com/zeromq/pyzmq.git
 # git checkout with the commands:
 # git clone http://github.com/zeromq/pyzmq.git pyzmq.git
 # cd pyzmq.git
 # git archive --format=tar --prefix=pyzmq-%%{version}/ %%{checkout} | xz -z --force - > pyzmq-%%{version}.tar.xz
-Source0:        http://cloud.github.com/downloads/zeromq/pyzmq/pyzmq-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
+
+BuildRequires:  chrpath
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  zeromq3-devel
 BuildRequires:  python-nose
+BuildRequires:  Cython
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
@@ -108,6 +111,14 @@ This package contains the testsuite for the python bindings.
 
 %prep
 %setup -q -n %{srcname}-%{version}
+
+# remove bundled libraries
+rm -rf bundled
+
+# forcibly regenerate the Cython-generated .c files:
+find zmq -name "*.c" -delete
+%{__python} setup.py cython
+
 # remove shebangs
 for lib in zmq/eventloop/*.py; do
     sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
@@ -128,6 +139,7 @@ rm -rf %{py3dir}
 cp -a . %{py3dir}
 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
 rm -r %{py3dir}/examples
+2to3 --write --nobackups %{py3dir}/zmq/green
 
 %endif
 
@@ -144,6 +156,7 @@ popd
 
 
 %install
+%global RPATH /zmq/{backend/cython,devices}
 # Must do the python3 install first because the scripts in /usr/bin are
 # overwritten with every setup.py install (and we want the python2 version
 # to be the default for now).
@@ -151,16 +164,14 @@ popd
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
 
-# remove tests doesn't work here, do that after running the tests
-
 popd
+chrpath --delete %{buildroot}%{python3_sitearch}%{RPATH}/*.so
 %endif # with_python3
 
 
 %{__python} setupegg.py install -O1 --skip-build --root %{buildroot}
 
-# remove tests doesn't work here, do that after running the tests
-
+chrpath --delete %{buildroot}%{python_sitearch}%{RPATH}/*.so
 
 
 %check
@@ -182,7 +193,7 @@ popd
 
 %files
 %defattr(-,root,root,-)
-%doc README.rst COPYING.LESSER examples/
+%doc README.md COPYING.* examples/
 %{python_sitearch}/%{srcname}-*.egg-info
 %{python_sitearch}/zmq
 %exclude %{python_sitearch}/zmq/tests
@@ -194,7 +205,7 @@ popd
 %if 0%{?with_python3}
 %files -n python3-zmq
 %defattr(-,root,root,-)
-%doc README.rst COPYING.LESSER
+%doc README.md COPYING.*
 # examples/
 %{python3_sitearch}/%{srcname}-*.egg-info
 %{python3_sitearch}/zmq
@@ -207,6 +218,9 @@ popd
 
 
 %changelog
+* Wed Aug 27 2014 Thomas Spura <tomspur@fedoraproject.org> - 14.3.1-1
+- update to 14.3.1 (#1134571)
+
 * Fri Dec 14 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0.1-1
 - update to 2.2.0.1
 
diff --git a/sources b/sources
index 6664fa3..6341a24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2f80709e84c8ac72d6671eee645d804  pyzmq-2.2.0.1.tar.gz
+7196b4a6fbf98022f17ffa924be3d68d  pyzmq-14.3.1.tar.gz