Update for Salt 2016.11.5

.gitignore

@@ -70,3 +70,4 @@
 /salt-2016.11.2.tar.gz
 /salt-2016.11.3.tar.gz
 /salt-2016.11.4.tar.gz
+/salt-2016.11.5.tar.gz

salt-proxy@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=salt-proxy service
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/salt-proxy --proxyid=%I
+Type=simple
+Restart=on-failure
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target

salt.spec

@@ -38,7 +38,7 @@
 %define _salttesting_ver 2016.10.26
 
 Name: salt
-Version: 2016.11.4
+Version: 2016.11.5
 Release: 2%{?dist}
 Summary: A parallel remote execution system
 
@@ -67,6 +67,7 @@ Source18: salt-master.fish
 Source19: salt-minion.fish
 Source20: salt-run.fish
 Source21: salt-syndic.fish
+Source22: %{name}-proxy@.service
 
 ## Patch0:  salt-%%{version}-tests.patch
 
@@ -99,7 +100,13 @@ Requires: python26-six
 %if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests})
 BuildRequires: python-tornado >= 4.2.1
 BuildRequires: python-futures >= 2.0
+
+%if (0%{?rhel} >= 6 && 0%{__isa_bits} == 64)
+BuildRequires: python2-pycryptodomex >= 3.4.3
+%else
 BuildRequires: python-crypto >= 2.6.1
+%endif
+
 BuildRequires: python-jinja2
 BuildRequires: python-msgpack > 0.3
 BuildRequires: python-pip
@@ -123,12 +130,20 @@ BuildRequires: python-argparse
 %endif
 
 BuildRequires: python%{?__python_ver}-devel
-Requires: python%{?__python_ver}-crypto >= 2.6.1
+
 Requires: python%{?__python_ver}-jinja2
 Requires: python%{?__python_ver}-msgpack > 0.3
 %if ( "0%{?dist}" == "0.amzn1" )
 Requires: python27-PyYAML
+Requires: python%{?__python_ver}
+Requires: python%{?__python_ver}-crypto >= 2.6.1
 %else
+## %%if (0%%{?rhel} >= 6 && 0%%{__isa_bits} == 64)
+## Requires: python2-pycryptodomex >= 3.4.3
+## %%else
+Requires: python-crypto >= 2.6.1
+## %endif
+
 Requires: PyYAML
 %endif
 Requires: python%{?__python_ver}-requests >= 1.0.0
@@ -291,6 +306,7 @@ install -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
+install -p -m 0644 %{SOURCE22} %{buildroot}%{_unitdir}/
 %endif
 
 # Force python2.6 on EPEL6
@@ -391,6 +407,7 @@ rm -rf %{buildroot}
 %attr(0755, root, root) %{_initrddir}/salt-minion
 %else
 %{_unitdir}/salt-minion.service
+%{_unitdir}/salt-proxy@.service
 %endif
 %config(noreplace) %{_sysconfdir}/salt/minion
 %config(noreplace) %{_sysconfdir}/salt/proxy
@@ -612,8 +629,13 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Thu Apr 20 2017 SaltStack Packaging Team <packaging@saltstack.com> - 2016.11.4-2
-- Use python-crypto on fedora platforms till pycryptodomex becomes available
+* Wed May 10 2017 SaltStack Packaging Team <packaging@saltstack.com> - 2016.11.5-2
+- Commented out check for pycryptodomex on Fedora
+
+* Wed May 10 2017 SaltStack Packaging Team <packaging@saltstack.com> - 2016.11.5-1
+- Update to feature release 2016.11.5
+- Altered to use pycryptodomex if 64 bit and Redhat 6 and greater otherwise pycrypto
+- Addition of salt-proxy@.service
 
 * Wed Apr 19 2017 SaltStack Packaging Team <packaging@saltstack.com> - 2016.11.4-1
 - Update to feature release 2016.11.4 and use of pycryptodomex

sources

@@ -1,2 +1,2 @@
 SHA512 (SaltTesting-2016.10.26.tar.gz) = 0817d3738992bb1e89728a9cd939056bc919de9c995445aac8820f895204e0f14df4cff989c46456b382180e3a1685827a113dbb609518e88c6b944f9222698a
-SHA512 (salt-2016.11.4.tar.gz) = ba928b61766d34774ce2e623fa79a46f6d373295c55b336e1b451e6a4afb0d547d78ceb9e466b64d8ba8bdbf2e750cbb77d008bc76308602729ae08241b8d346
+SHA512 (salt-2016.11.5.tar.gz) = 9afb40dbd3a508eacc43500566660763e2b219817d7de25ccf2d61d7f74b857238922ea40cc4c6372fd520bc6f524d84fb0a2d65f9890bedd79d0fc6c177edf9