From 392a25555816251adf1f4a5b2171f8d562f57137 Mon Sep 17 00:00:00 2001
From: Thomas Spura <thomas.spura@gmail.com>
Date: Oct 15 2012 08:54:06 +0000
Subject: Merge commit '52a009b9d6d9348c65347b4ee01d2d1dfd8f0f40' into el6


---

diff --git a/.gitignore b/.gitignore
index 5048bb2..e833506 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /pyzmq-2.1.1.tar.gz
 /pyzmq-2.1.4.tar.gz
 /pyzmq-2.1.9.tar.gz
+/pyzmq-2.1.11.tar.gz
+/pyzmq-2.2.0.tar.gz
diff --git a/python-zmq.spec b/python-zmq.spec
index 504f0ef..077e74a 100644
--- a/python-zmq.spec
+++ b/python-zmq.spec
@@ -1,11 +1,11 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora} > 12
 %global with_python3 1
 %endif
 
 
 %{?filter_setup:
 %filter_provides_in %{python_sitearch}/.*\.so$
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?with_python3}
 %filter_provides_in %{python3_sitearch}/.*\.so$
 %endif
 %filter_setup
@@ -18,7 +18,7 @@
 %global run_tests 1
 
 Name:           python-zmq
-Version:        2.1.9
+Version:        2.2.0
 Release:        3%{?dist}
 Summary:        Software library for fast, message-based applications
 
@@ -207,6 +207,21 @@ popd
 
 
 %changelog
+* Fri Aug  3 2012 David Malcolm <dmalcolm@redhat.com> - 2.2.0-3
+- remove rhel logic from with_python3 conditional
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Apr 26 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-1
+- update to 2.2.0
+
+* Wed Mar  7 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.1.11-1
+- update to new version
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Wed Dec 14 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.1.9-3
 - tests package requires main package
 - filter python3 libs
diff --git a/sources b/sources
index 9c669d5..7f3fa29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44efd9e7dd041b9f779e3026d189f870  pyzmq-2.1.9.tar.gz
+100b73973d6fb235b8da6adea403566e  pyzmq-2.2.0.tar.gz