[salt/f20] Update to 2014.1.4

[Erik Johnson]

commit 8a0631bd248dc9bc0b184354263c6a426714f12c
Author: Erik Johnson <erik at saltstack.com>
Date:   Tue May 6 01:46:51 2014 -0500

    Update to 2014.1.4

 .gitignore |   10 ++--------
 salt.spec  |   10 +++++-----
 sources    |   12 ++----------
 3 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78eeae3..e90117d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,13 +34,7 @@
 /salt-0.17.5.tar.gz
 /SaltTesting-0.5.4.tar.gz
 /salt-2014.1.0.tar.gz
-/README.fedora
-/salt-master
-/salt-master.service
-/salt-minion
-/salt-minion.service
-/salt-syndic
-/salt-syndic.service
 /salt-2014.1.1.tar.gz
 /salt-2014.1.3.tar.gz
-/fix-setup-py.patch
+/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 2dee91d..b4619f0 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,2 @@
-e9d0e19b6a326f99c210f86ae72a7c3d  salt-2014.1.3.tar.gz
-f6ea7c5cc6600035bee122dae8225f4b  SaltTesting-0.5.4.tar.gz
-bb430c342bcf152a2eab4926005a1cd3  README.fedora
-7ea2a1ce8fefec682cd89b619db39525  salt-master
-f66118a624fc7cbc5bcf01051c69e83a  salt-master.service
-353763201289d2fc57d53263c4dad524  salt-minion
-8ef6ab9bf9750f146d31bd8da9da963b  salt-minion.service
-9dd4f6cdd608f8bca63f9a5b7655073b  salt-syndic
-97e1daa0f7232f48d109b62890b68d0e  salt-syndic.service
-ae758da300e33cab7dd797709fe0982a  fix-setup-py.patch
+3a34a45c34e29e83572977d72258fc37  salt-2014.1.4.tar.gz
+4e91e01fc1819c783097dd484947442d  SaltTesting-2014.4.24.tar.gz