From 54e8d8b8deabca121845070543797ee8c66f9a6d Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik@saltstack.com>
Date: Tue, 7 Apr 2015 09:43:29 -0500
Subject: [PATCH] Update to bugfix release 2014.7.4

---
 .gitignore                                             | 1 +
 salt.spec                                              | 4 +++-
 skip_tests_2014.7.2.patch => skip_tests_2014.7.4.patch | 0
 sources                                                | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename skip_tests_2014.7.2.patch => skip_tests_2014.7.4.patch (100%)

diff --git a/.gitignore b/.gitignore
index 8c65480..0cf9971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /salt-2014.7.1.tar.gz
 /salt-2014.7.2.tar.gz
 /SaltTesting-2015.2.16.tar.gz
+/salt-2014.7.4.tar.gz
diff --git a/salt.spec b/salt.spec
index 6ce7894..0a3aa8d 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,7 +15,7 @@
 %define _salttesting_ver 2015.2.16
 
 Name: salt
-Version: 2014.7.2
+Version: 2014.7.4
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -158,6 +158,7 @@ infrastructure.
 Summary: REST API for Salt, a parallel remote execution system
 Group:   System administration tools
 Requires: %{name}-master = %{version}-%{release}
+Requires: python-cherrypy
 
 %description api
 salt-api provides a REST interface to the Salt master.
@@ -166,6 +167,7 @@ salt-api provides a REST interface to the Salt master.
 Summary: Cloud provisioner for Salt, a parallel remote execution system
 Group:   System administration tools
 Requires: %{name}-master = %{version}-%{release}
+Requires: python-libcloud
 
 %description cloud
 The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and
diff --git a/skip_tests_2014.7.2.patch b/skip_tests_2014.7.4.patch
similarity index 100%
rename from skip_tests_2014.7.2.patch
rename to skip_tests_2014.7.4.patch
diff --git a/sources b/sources
index a8fe9b2..e9288ad 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b7bf1d1e457fb7a26ccb849f0921833e  salt-2014.7.2.tar.gz
+1d10c9c3d4983829f5ec49cd29f8426e  salt-2014.7.4.tar.gz
 9a073ab776ebaa7a5911a94e799f757d  SaltTesting-2015.2.16.tar.gz