From 5b35adc2d2a9e45713eab53e73edb4ad5cbeba41 Mon Sep 17 00:00:00 2001
From: Clint Savage <herlo1@gmail.com>
Date: Fri, 14 Dec 2012 10:49:22 -0700
Subject: [PATCH] upstream release 0.11.0

---
 .gitignore |  1 +
 salt.spec  | 20 ++++++++++++--------
 sources    |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfc6422..159be84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /salt-0.10.3.tar.gz
 /salt-0.10.4.tar.gz
 /salt-0.10.5.tar.gz
+/salt-0.11.0.tar.gz
diff --git a/salt.spec b/salt.spec
index 572b7ee..7fc8f43 100644
--- a/salt.spec
+++ b/salt.spec
@@ -9,14 +9,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name: salt
-Version: 0.10.5
+Version: 0.11.0
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
 License: ASL 2.0
 URL:     http://saltstack.org/
-Source0: https://github.com/downloads/saltstack/%{name}/%{name}-%{version}.tar.gz
+Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
 Source1: %{name}-master
 Source2: %{name}-syndic
 Source3: %{name}-minion
@@ -139,10 +139,8 @@ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/
 install -p %{SOURCE7} .
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/salt/
-install -p -m 0640 conf/minion.template $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion
-install -p -m 0640 conf/minion.template $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion.template
-install -p -m 0640 conf/master.template $RPM_BUILD_ROOT%{_sysconfdir}/salt/master
-install -p -m 0640 conf/master.template $RPM_BUILD_ROOT%{_sysconfdir}/salt/master.template
+install -p -m 0640 conf/minion $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion
+install -p -m 0640 conf/master $RPM_BUILD_ROOT%{_sysconfdir}/salt/master
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -169,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %config(noreplace) %{_sysconfdir}/salt/minion
-%config %{_sysconfdir}/salt/minion.template
 
 %files -n salt-master
 %defattr(-,root,root)
@@ -193,7 +190,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_unitdir}/salt-syndic.service
 %endif
 %config(noreplace) %{_sysconfdir}/salt/master
-%config %{_sysconfdir}/salt/master.template
 
 # less than RHEL 8 / Fedora 16
 # not sure if RHEL 7 will use systemd yet
@@ -294,6 +290,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec 14 2012 Clint Savage <herlo1@gmail.com> - 0.11.0-1
+- Moved to upstream release 0.11.0
+
+* Wed Dec 05 2012 Mike Chesnut <mchesnut@gmail.com> - 0.10.5-2
+- moved to upstream release 0.10.5
+- removing references to minion.template and master.template, as those files
+  have been removed from the repo
+
 * Sun Nov 18 2012 Clint Savage <herlo1@gmail.com> - 0.10.5-1
 - Moved to upstream release 0.10.5
 - Added pciutils as Requires
diff --git a/sources b/sources
index 91573e1..afca59b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e38e4a04024a1b68717d732625ec054  salt-0.10.5.tar.gz
+8993221eb89ba56411c6e50755004ccc  salt-0.11.0.tar.gz