From 9d98231cf02cfc82d252bbc86dfbb7506bec4b71 Mon Sep 17 00:00:00 2001
From: Clint Savage <herlo1@gmail.com>
Date: Sat, 16 Feb 2013 14:37:12 -0700
Subject: [PATCH] update to new upstream release 0.13.1

---
 .gitignore |  1 +
 salt.spec  | 29 ++++++++++++++++++++++-------
 sources    |  3 +--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18398b3..80c6cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /salt-0.11.1.tar.gz
 /salt-0.12.0.tar.gz
 /salt-0.12.1.tar.gz
+/salt-0.13.1.tar.gz
diff --git a/salt.spec b/salt.spec
index 162e152..a689611 100644
--- a/salt.spec
+++ b/salt.spec
@@ -1,16 +1,17 @@
 %if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12)
 %global with_python26 1
-%global include_tests 0
 %define pybasever 2.6
 %define __python_ver 26
 %define __python %{_bindir}/python%{?pybasever}
 %endif
 
+%global include_tests 1
+
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name: salt
-Version: 0.12.1
+Version: 0.13.1
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
@@ -54,6 +55,15 @@ Requires: python26-msgpack
 
 %else
 
+%if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests})
+BuildRequires: python-unittest2
+# this BR causes windows tests to happen
+# clearly, that's not desired
+# https://github.com/saltstack/salt/issues/3749
+#BuildRequires: python-mock
+BuildRequires: git
+%endif
+
 BuildRequires: python-zmq
 BuildRequires: python-crypto
 BuildRequires: python-devel
@@ -61,9 +71,7 @@ BuildRequires: PyYAML
 BuildRequires: m2crypto
 BuildRequires: python-msgpack
 
-%if 0%{?include_tests}
-BuildRequires: python-unittest2
-%endif
+
 BuildRequires: python-jinja2
 
 Requires: python-crypto
@@ -150,9 +158,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/salt/
 install -p -m 0640 conf/minion $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion
 install -p -m 0640 conf/master $RPM_BUILD_ROOT%{_sysconfdir}/salt/master
 
-%if 0%{?include_tests}
+%if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests})
 %check
-%{__python} setup.py test
+%{__python} setup.py test --runtests-opts=-u
 %endif
 
 %clean
@@ -303,6 +311,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Feb 15 2013 Clint Savage <herlo1@gmail.com> - 0.13.1-1
+- Update to upstream patch release 0.13.1
+- Add unittest support
+
+* Sat Feb 02 2013 Clint Savage <herlo1@gmail.com> - 0.12.1-1
+- Remove patches and update to upstream patch release 0.12.1
+
 * Thu Jan 17 2013 Wendall Cada <wendallc@83864.com> - 0.12.0-2
 - Added unittest support
 
diff --git a/sources b/sources
index c5c360c..3586150 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-56f586d9b1717bd414aa9657b6ee064b  salt-0.12.0.tar.gz
-693338c0a47138c8a7ec3564712a7035  salt-0.12.1.tar.gz
+3919ee94e6c32d182a6e410065ba888d  salt-0.13.1.tar.gz