Merge branch 'master' of ssh://pkgs.fedoraproject.org/salt

.gitignore

@@ -42,5 +42,3 @@
 /salt-syndic
 /salt-syndic.service
 /salt-2014.1.3.tar.gz
-/fix-setup-py.patch
-/salt-2014.1.4.tar.gz

fix-setup-py.patch

@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 6feb5d0..6b08e12 100755
+--- a/setup.py
++++ b/setup.py
+@@ -513,7 +513,7 @@ FREEZER_INCLUDES = [
+     'email.mime.*',
+ ]
+ 
+-if hasattr(zmq, 'pyzmq_version_info'):
++if HAS_ZMQ and hasattr(zmq, 'pyzmq_version_info'):
+     if HAS_ZMQ and zmq.pyzmq_version_info() >= (0, 14):
+         # We're freezing, and when freezing ZMQ needs to be installed, so this
+         # works fine