[salt/f19] Add cache directory to common package

[Erik Johnson]

commit 8871751a9c0009052367f29aa5f60bffde65e787
Author: Erik Johnson <erik at saltstack.com>
Date:   Tue Aug 5 20:28:17 2014 -0500

    Add cache directory to common package

 .gitignore |    1 +
 salt.spec  |   49 ++++++++++++++++++++++++++++---------------------
 sources    |    2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aec05af..eda9da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /salt-2014.1.5.tar.gz
 /salt-2014.1.7.tar.gz
 /salt-2014.1.10.tar.gz
+/SaltTesting-2014.8.5.tar.gz
diff --git a/salt.spec b/salt.spec
index b33d505..dbb9b97 100644
--- a/salt.spec
+++ b/salt.spec
@@ -5,18 +5,18 @@
 %define __python %{_bindir}/python%{?pybasever}
 %endif
 
-%global include_tests 0
+%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))")}
 %{!?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 2014.4.24
+%define _salttesting_ver 2014.8.5
 
 Name: salt
 Version: 2014.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -34,7 +34,6 @@ Source8: README.fedora
 Source9: logrotate.salt
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch: noarch
 
 %ifarch %{ix86} x86_64
@@ -126,7 +125,9 @@ servers, handle them quickly and through a simple and manageable interface.
 Summary: Management component for salt, a parallel remote execution system 
 Group:   System Environment/Daemons
 Requires: salt = %{version}-%{release}
+%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
 Requires: systemd-python
+%endif
 
 %description -n salt-master 
 The Salt master is the central server to which all minions connect.
@@ -147,29 +148,31 @@ Salt minion is queried and controlled from the master.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 cd $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --root %{buildroot}
+
+install -d -m 0755 %{buildroot}%{_var}/cache/salt
 
 %if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/
-install -p %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/
+mkdir -p %{buildroot}%{_initrddir}
+install -p %{SOURCE2} %{buildroot}%{_initrddir}/
+install -p %{SOURCE3} %{buildroot}%{_initrddir}/
+install -p %{SOURCE4} %{buildroot}%{_initrddir}/
 %else
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/
-install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
-install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}/
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/
+install -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
 %endif
 
 install -p %{SOURCE8} .
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
-install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/salt
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
+install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/salt
 
-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
+mkdir -p %{buildroot}%{_sysconfdir}/salt/
+install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/salt/minion
+install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/salt/master
 
 %if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests})
 %check
@@ -178,13 +181,15 @@ PYTHONPATH=%{pythonpath}:$RPM_BUILD_DIR/%{name}-%{version}/%{_salttesting}-%{_sa
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/LICENSE
 %{python_sitelib}/%{name}/*
 %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
+%{_sysconfdir}/logrotate.d/salt
+%{_var}/cache/salt
 %doc %{_mandir}/man7/salt.7.*
 %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/README.fedora
 
@@ -192,7 +197,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc %{_mandir}/man1/salt-call.1.*
 %doc %{_mandir}/man1/salt-minion.1.*
-%{_sysconfdir}/logrotate.d/salt
 %{_bindir}/salt-minion
 %{_bindir}/salt-call
 
@@ -328,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 5 2014 Erik Johnson <erik at saltstack.com> - 2014.1.10-2
+- Deploy cachedir with package
+
 * Mon Aug 4 2014 Erik Johnson <erik at saltstack.com> - 2014.1.10-1
 - Update to bugfix release 2014.1.10
 
diff --git a/sources b/sources
index f00e508..1217840 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ff6dff1ce949ab176745a30bde17e81d  salt-2014.1.10.tar.gz
-4e91e01fc1819c783097dd484947442d  SaltTesting-2014.4.24.tar.gz
+98fde1446d85ad42eaf2949871037b87  SaltTesting-2014.8.5.tar.gz