diff --git a/salt-2014.1.0.tar.gz b/salt-2014.1.0.tar.gz deleted file mode 100644 index 90002af..0000000 --- a/salt-2014.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:168dd154a9243b1c853700e61f56e7d6ab5cbc9862fb215ab991e05f46b2a406 -size 2787665 diff --git a/salt-2014.1.1.tar.gz b/salt-2014.1.1.tar.gz new file mode 100644 index 0000000..d6bb6c9 --- /dev/null +++ b/salt-2014.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbe145c6e11db3697f2f13bca9cc341a4d6b459751e56142d34eec5a4187b743 +size 2811441 diff --git a/salt.changes b/salt.changes index d4236ba..d9b318d 100644 --- a/salt.changes +++ b/salt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 19 19:29:13 UTC 2014 - aboe76@gmail.com + +- Updated to 2014.1.1 Bug Fix release +- temporarily disabled integration check after consult with Upstream +------------------------------------------------------------------- Thu Feb 20 19:10:20 UTC 2014 - aboe76@gmail.com - Updated to 2014.1.0 Major Release diff --git a/salt.spec b/salt.spec index 90b9fd4..69269fa 100644 --- a/salt.spec +++ b/salt.spec @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.0 +Version: 2014.1.1 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -52,6 +52,10 @@ BuildRequires: python-pip BuildRequires: python-salt-testing BuildRequires: python-unittest2 BuildRequires: python-xml +%if 0%{?suse_version} >= 1210 +BuildRequires: python-pssh +%{?systemd_requires} +%endif #for docs BuildRequires: python-sphinx @@ -252,8 +256,8 @@ install -Dpm 0644 pkg/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotat ## install SuSEfirewall2 rules install -Dpm 0644 pkg/suse/salt.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt -%check -%{__python} setup.py test --runtests-opts=-u +#%%check +#%%{__python} setup.py test --runtests-opts=-u %preun syndic %if 0%{?_unitdir:1}