terminalmage pushed to salt (epel7). "Update to bugfix release 2014.7.4"

[notifications at fedoraproject.org]

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


diff --git a/.gitignore b/.gitignore
index ffb1840..3680499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,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 99f77b7..d20d2cf 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.2.patch
deleted file mode 100644
index 9f6c796..0000000
--- a/skip_tests_2014.7.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
-index 57ba81e..713f3cd 100644
---- a/tests/unit/pydsl_test.py
-+++ b/tests/unit/pydsl_test.py
-@@ -9,7 +9,7 @@ import textwrap
- from cStringIO import StringIO
- 
- # Import Salt Testing libs
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.helpers import ensure_in_syspath
- 
- ensure_in_syspath('../')
-@@ -298,6 +298,7 @@ class PyDSLRendererTestCase(TestCase):
-         finally:
-             shutil.rmtree(dirpath, ignore_errors=True)
- 
-+    @skipIf(True, 'Not failing in jenkins, skip for this build')
-     def test_rendering_includes(self):
-         dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
-         if not os.path.isdir(dirpath):
diff --git a/skip_tests_2014.7.4.patch b/skip_tests_2014.7.4.patch
new file mode 100644
index 0000000..9f6c796
--- /dev/null
+++ b/skip_tests_2014.7.4.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 57ba81e..713f3cd 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -9,7 +9,7 @@ import textwrap
+ from cStringIO import StringIO
+ 
+ # Import Salt Testing libs
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.helpers import ensure_in_syspath
+ 
+ ensure_in_syspath('../')
+@@ -298,6 +298,7 @@ class PyDSLRendererTestCase(TestCase):
+         finally:
+             shutil.rmtree(dirpath, ignore_errors=True)
+ 
++    @skipIf(True, 'Not failing in jenkins, skip for this build')
+     def test_rendering_includes(self):
+         dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+         if not os.path.isdir(dirpath):
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
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/salt.git/commit/?h=epel7&id=a2fc6d84867ec47e178671ae7c1b45c04adecaa5