[salt/el5] Update to 2014.1.4

[Erik Johnson]

commit e5b172132d32ef86334a33dfd42777225dbb103e
Author: Erik Johnson <erik at saltstack.com>
Date:   Tue May 6 01:12:17 2014 -0500

    Update to 2014.1.4

 salt.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/salt.spec b/salt.spec
index 1bd4cf5..45d7f66 100644
--- a/salt.spec
+++ b/salt.spec
@@ -12,10 +12,10 @@
 %{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")}
 
 %define _salttesting SaltTesting
-%define _salttesting_ver 0.5.4
+%define _salttesting_ver 2014.4.24
 
 Name: salt
-Version: 2014.1.3
+Version: 2014.1.4
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -31,7 +31,6 @@ Source5: %{name}-master.service
 Source6: %{name}-syndic.service
 Source7: %{name}-minion.service
 Source8: README.fedora
-Patch0: fix-setup-py.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -139,8 +138,6 @@ Salt minion is queried and controlled from the master.
 
 %prep
 %setup -c
-cd %{name}-%{version}
-%patch0 -p1
 %setup -T -D -a 1
 
 %build
@@ -325,6 +322,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue May 6 2014 Erik Johnson <erik at saltstack.com> - 2014.1.4-1
+- Update to bugfix release 2014.1.4
+
 * Fri Apr 18 2014 Erik Johnson <erik at saltstack.com> - 2014.1.3-1
 - Update to bugfix release 2014.1.3