Update for Salt 2018.3.3 point release

.gitignore

@@ -80,3 +80,4 @@
 /salt-2017.7.5.tar.gz
 /salt-2018.3.0.tar.gz
 /salt-2018.3.2.tar.gz
+/salt-2018.3.3.tar.gz

salt-syndic.service

@@ -2,6 +2,7 @@
 Description=The Salt Master Server
 Documentation=man:salt-syndic(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html
 After=network.target
+PartOf=salt-master.service
 
 [Service]
 Type=notify

salt.spec

@@ -22,6 +22,7 @@
 %{!?pythonpath: %global pythonpath %(%{__python2} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")}
 
 
+
 %if 0%{?rhel} == 6
 %global with_python3 0
 
@@ -44,8 +45,8 @@
 %define fish_dir %{_datadir}/fish/vendor_functions.d
 
 Name: salt
-Version: 2018.3.2%{?__rc_ver}
-Release: 5%{?dist}
+Version: 2018.3.3%{?__rc_ver}
+Release: 1%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -109,7 +110,7 @@ BuildRequires: PyYAML
 %endif
 
 BuildRequires: python%{?__python_ver}-requests
-## BuildRequires: python%{?__python_ver}-unittest2
+## BuildRequires: python%%{?__python_ver}-unittest2
 
 # this BR causes windows tests to happen
 # clearly, that's not desired
@@ -124,7 +125,7 @@ BuildRequires: python%{?__python_ver}-six
 BuildRequires: python-argparse
 %endif
 
-%endif  ##  ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests})
+%endif  ##  ((0%%{?rhel} >= 6 || 0%%{?fedora} > 12) && 0%%{?include_tests})
 
 BuildRequires: python%{?__python_ver}-devel
 
@@ -219,8 +220,7 @@ infrastructure.
 Summary: REST API for Salt, a parallel remote execution system
 Group:   Applications/System
 Requires: %{name}-master = %{version}-%{release}
-Requires: python%{?__python_ver}-cherrypy
-
+Requires: python%{?__python_ver}-cherrypy >= 3.2.2, python%{?__python_ver}-cherrypy < 18.0.0
 
 %description api
 salt-api provides a REST interface to the Salt master.
@@ -245,8 +245,8 @@ The salt-ssh tool can run remote execution functions and states without the use
 of an agent (salt-minion) service.
 
 %prep
-## %setup -q -c
-## %setup -q -T -D -a 1
+## %%setup -q -c
+## %%setup -q -T -D -a 1
 %setup -c
 
 cd %{name}-%{version}
@@ -617,6 +617,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Oct 15 2018 SaltStack Packaging Team <packaging@Ch3LL.com> - 2018.3.3-1
+- Update to feature release 2018.3.3-1  for Python 2
+- Revised versions of cherrypy acceptable
+
 * Tue Jul 24 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-5
 - Fix version of python used, multiple addition of 2.7 
 
@@ -998,4 +1002,3 @@ rm -rf %{buildroot}
 
 * Fri Sep 09 2011 Clint Savage <herlo1@gmail.com> - 0.9.1-1
 - Initial packages
-

sources

@@ -1 +1 @@
-SHA512 (salt-2018.3.2.tar.gz) = 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3
+SHA512 (salt-2018.3.3.tar.gz) = f00ed83d5ec9d4767d7215fae8569ec560db61a0c8ded17469026e682e367c19811d33c6c53590a275ee24ad897a0eac09d8fde8ae9320d8706d6459ff3cc6da