diff --git a/salt.spec b/salt.spec index 2c0e0f5..6d24c2a 100644 --- a/salt.spec +++ b/salt.spec @@ -12,8 +12,6 @@ %{!?python3_pkgversion:%global python3_pkgversion 3} %endif -%global include_tests 0 - # Release Candidate %define __rc_ver %{nil} @@ -21,7 +19,7 @@ Name: salt Version: 3000%{?__rc_ver} -Release: 4%{?dist} +Release: 5%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -122,13 +120,9 @@ Requires: python%{python3_pkgversion}-pycurl Requires: python%{python3_pkgversion}-six Requires: python%{python3_pkgversion}-psutil -%if 0%{?rhel} == 7 -Requires: python%{python3_pkgversion}-PyYAML -%else Requires: python%{python3_pkgversion}-pyyaml Requires: python%{python3_pkgversion}-distro %endif -%endif %description @@ -145,11 +139,7 @@ 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: %{name} = %{version}-%{release} -%if 0%{?rhel} > 7 -Requires: python%{python3_pkgversion}-systemd -%else -Requires: systemd-python -%endif +Requires: python%{python3_pkgversion}-systemd %description master The Salt master is the central server to which all minions connect. @@ -518,6 +508,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 25 2020 SaltStack Packaging Team - 3000-5 +- Fix lint clean up issues + * Tue Feb 25 2020 SaltStack Packaging Team - 3000-4 - Removed cherrypy < 18.0.0 check since python 3.5 no longer used on Fedora diff --git a/sources b/sources index 7310a3f..9355f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-3000.tar.gz) = 978c5dcfb78df7d1671fd791f8ebb6b33af6bb2d504460de4ea11ea1715cf29fba0805e9784f482d9a4ece165dc28f5572ef649c97ac79766f1aa36366c93ae6 +SHA512 (salt-3000.tar.gz) = 7ae4a59cd985923891614c5df0a67fea57ce61f66ef5883d25127a530bc6baa72ef9dc56ea8dce96d9993c531b3ffa9c419b3052e7a1f6969780a973e8d1f735