diff --git a/.gitignore b/.gitignore index 8439629..0fda239 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /salt-2017.7.4.tar.gz /salt-2017.7.5.tar.gz /salt-2018.3.0.tar.gz +/salt-2018.3.2.tar.gz diff --git a/salt.spec b/salt.spec index 4d5d7c7..0e0b063 100644 --- a/salt.spec +++ b/salt.spec @@ -41,8 +41,8 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 2018.3.0%{?__rc_ver} -Release: 2%{?dist} +Version: 2018.3.2%{?__rc_ver} +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons @@ -73,6 +73,8 @@ Source21: salt-syndic.fish ## Patch0: salt-%%{version}-tests.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %ifarch %{ix86} x86_64 @@ -89,13 +91,13 @@ Requires: yum-utils %endif %if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests}) -BuildRequires: python%{?__python_ver}-tornado >= 4.2.1, python%{?__python_ver}-tornado < 5.0 +BuildRequires: python%{?__python_ver}-tornado >= 4.2.1 BuildRequires: python%{?__python_ver}-futures >= 2.0 BuildRequires: python%{?__python_ver}-crypto >= 2.6.1 BuildRequires: python%{?__python_ver}-jinja2 -BuildRequires: python%{?__python_ver}-msgpack > 0.3 +BuildRequires: python%{?__python_ver}-msgpack >= 0.4 BuildRequires: python%{?__python_ver}-pip -BuildRequires: python%{?__python_ver}-zmq +BuildRequires: python%{?__python_ver}-zmq >= 14.5 %if 0%{?with_explicit_python27} BuildRequires: PyYAML%{?__python_ver} @@ -125,7 +127,7 @@ BuildRequires: python%{?__python_ver}-devel Requires: python%{?__python_ver}-jinja2 -Requires: python%{?__python_ver}-msgpack > 0.3 +Requires: python%{?__python_ver}-msgpack >= 0.4 Requires: python%{?__python_ver}-crypto >= 2.6.1 %if ( "0%{?dist}" == "0.amzn1" ) @@ -332,6 +334,8 @@ mkdir %{_tmppath}/salt-test-cache PYTHONPATH=%{pythonpath} %{__python} setup.py test --runtests-opts=-u %endif +%clean +rm -rf %{buildroot} %files %defattr(-,root,root,-) @@ -622,8 +626,12 @@ PYTHONPATH=%{pythonpath} %{__python} setup.py test --runtests-opts=-u %endif %changelog -* Mon May 07 2018 SaltStack Packaging Team - 2018.3.0-2 -- Corrected changelog and cleaned up spec file +* Thu Jun 21 2018 SaltStack Packaging Team - 2018.3.2-1 +- Update to feature release 2018.3.2-1 for Python 2 + +* Fri Jun 08 2018 SaltStack Packaging Team - 2018.3.1-1 +- Update to feature release 2018.3.1-1 for Python 2 +- Revised minimum msgpack version >= 0.4 * Fri Mar 30 2018 SaltStack Packaging Team - 2018.3.0-1 - Update to feature release 2018.3.0-1 @@ -635,9 +643,6 @@ PYTHONPATH=%{pythonpath} %{__python} setup.py test --runtests-opts=-u - Update to feature release 2017.7.4-1 - Limit to Tornado use to between versions 4.2.1 and less than 5.0 -* Fri Feb 09 2018 Fedora Release Engineering - 2017.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Tue Jan 30 2018 SaltStack Packaging Team - 2017.7.3-1 - Update to feature release 2017.7.3-1 @@ -990,3 +995,4 @@ PYTHONPATH=%{pythonpath} %{__python} setup.py test --runtests-opts=-u * Fri Sep 09 2011 Clint Savage - 0.9.1-1 - Initial packages + diff --git a/sources b/sources index 8d28c9e..8a73326 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-2018.3.0.tar.gz) = 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5 +SHA512 (salt-2018.3.2.tar.gz) = 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3