[salt: 4/4] Update to 2014.1.4

[Erik Johnson]

commit 878a82e638e044e4baed7ebe125b3c85e3215b2a
Author: Erik Johnson <erik at saltstack.com>
Date:   Tue May 6 00:28:28 2014 -0500

    Update to 2014.1.4

 .gitignore |    2 ++
 salt.spec  |   10 +++++-----
 sources    |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 10d5dfa..73cafaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 /SaltTesting-0.5.4.tar.gz
 /salt-2014.1.1.tar.gz
 /salt-2014.1.3.tar.gz
+/salt-2014.1.4.tar.gz
+/SaltTesting-2014.4.24.tar.gz
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
 
diff --git a/sources b/sources
index f4c2632..b4619f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3a34a45c34e29e83572977d72258fc37  salt-2014.1.4.tar.gz
-f6ea7c5cc6600035bee122dae8225f4b  SaltTesting-0.5.4.tar.gz
+4e91e01fc1819c783097dd484947442d  SaltTesting-2014.4.24.tar.gz