From 3d4e91304e5ea5405c18231c915ec7992465d21d Mon Sep 17 00:00:00 2001
From: Clint Savage <herlo1@gmail.com>
Date: Wed, 13 Mar 2013 14:11:42 -0600
Subject: [PATCH] updating to upstream patch release 0.13.2

---
 .gitignore                              |  1 +
 0003-Late-stage-jinja2-dependency.patch | 39 ---------------------
 0004-Jinja2-no-longer-build-dep.patch   | 45 -------------------------
 salt.spec                               |  7 ++--
 sources                                 |  2 +-
 5 files changed, 6 insertions(+), 88 deletions(-)
 delete mode 100644 0003-Late-stage-jinja2-dependency.patch
 delete mode 100644 0004-Jinja2-no-longer-build-dep.patch

diff --git a/.gitignore b/.gitignore
index 80c6cec..d8644fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /salt-0.12.0.tar.gz
 /salt-0.12.1.tar.gz
 /salt-0.13.1.tar.gz
+/salt-0.13.2.tar.gz
diff --git a/0003-Late-stage-jinja2-dependency.patch b/0003-Late-stage-jinja2-dependency.patch
deleted file mode 100644
index 9163bcc..0000000
--- a/0003-Late-stage-jinja2-dependency.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7a5a8b54b4a2c7ce8fa972a70693959835e65db8 Mon Sep 17 00:00:00 2001
-From: Pedro Algarvio <pedro@algarvio.me>
-Date: Wed, 16 Jan 2013 19:34:15 +0000
-Subject: [PATCH] Defer imports to a later stage so Jinja2 does not become a
- build dependency. Fixes #3293.
-
----
- salt/utils/__init__.py |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py
-index 290339d..11f428d 100644
---- a/salt/utils/__init__.py
-+++ b/salt/utils/__init__.py
-@@ -30,8 +30,6 @@
-     HAS_FNCTL = False
- 
- # Import salt libs
--import salt.minion
--import salt.payload
- from salt.exceptions import SaltClientError, CommandNotFoundError
- 
- 
-@@ -196,6 +194,12 @@ def daemonize_if(opts, **kwargs):
-             data[key[6:]] = val
-     if not 'jid' in data:
-         return
-+
-+    # Late import salt libs to overcome circular imports and to allow building
-+    # salt without making Jinja2 a build dependency
-+    import salt.minon
-+    import salt.payload
-+
-     serial = salt.payload.Serial(opts)
-     proc_dir = salt.minion.get_proc_dir(opts['cachedir'])
-     fn_ = os.path.join(proc_dir, data['jid'])
--- 
-1.7.10
-
diff --git a/0004-Jinja2-no-longer-build-dep.patch b/0004-Jinja2-no-longer-build-dep.patch
deleted file mode 100644
index 22d026c..0000000
--- a/0004-Jinja2-no-longer-build-dep.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 56cf893eb2fb61a6010235eda2f35170cd81fefa Mon Sep 17 00:00:00 2001
-From: Pedro Algarvio <pedro@algarvio.me>
-Date: Wed, 16 Jan 2013 20:14:43 +0000
-Subject: [PATCH] Jinja2 is no longer a build dependency. Fixes #3293.
-
----
- salt/utils/templates.py |   12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/salt/utils/templates.py b/salt/utils/templates.py
-index a75bcb4..60631ce 100644
---- a/salt/utils/templates.py
-+++ b/salt/utils/templates.py
-@@ -12,14 +12,10 @@
- import tempfile
- import traceback
- 
--# Import third party libs
--import jinja2
--import jinja2.ext
--
- # Import salt libs
- import salt.utils
- import salt.exceptions
--from salt.utils.jinja import SaltCacheLoader as JinjaSaltCacheLoader
-+
- 
- log = logging.getLogger(__name__)
- 
-@@ -72,6 +68,12 @@ def render_tmpl(tmplsrc, from_str=False, to_str=False,
- 
- 
- def render_jinja_tmpl(tmplstr, context, tmplpath=None):
-+    # Late import Jinja2 to allow building salt without making it a build
-+    # dependency
-+    import jinja2
-+    import jinja2.ext
-+    from salt.utils.jinja import SaltCacheLoader as JinjaSaltCacheLoader
-+
-     opts = context['opts']
-     env = context['env']
-     loader = None
--- 
-1.7.10
-
diff --git a/salt.spec b/salt.spec
index a689611..448dc18 100644
--- a/salt.spec
+++ b/salt.spec
@@ -11,7 +11,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name: salt
-Version: 0.13.1
+Version: 0.13.2
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -104,8 +104,6 @@ BuildRequires: systemd-units
 
 %endif
 
-#Requires: MySQL-python libvirt-python yum
-
 %description
 Salt is a distributed remote execution system used to execute commands and 
 query data. It was developed in order to bring the best solutions found in 
@@ -311,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 13 2013 Clint Savage <herlo1@gmail.com> - 0.13.2-1
+- Update to upstream patch release 0.13.2
+
 * Fri Feb 15 2013 Clint Savage <herlo1@gmail.com> - 0.13.1-1
 - Update to upstream patch release 0.13.1
 - Add unittest support
diff --git a/sources b/sources
index 3586150..1bb0d1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3919ee94e6c32d182a6e410065ba888d  salt-0.13.1.tar.gz
+b18ab3d0f4fcb79ab8552b8dbcd5a002  salt-0.13.2.tar.gz