diff --git a/.gitignore b/.gitignore index 9eb6cec..410f065 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,11 @@ /salt-0.17.4.tar.gz /salt-0.17.5.tar.gz /SaltTesting-0.5.4.tar.gz +/salt-2014.1.1.tar.gz +/README.fedora +/salt-master +/salt-master.service +/salt-minion +/salt-minion.service +/salt-syndic +/salt-syndic.service diff --git a/salt-minion b/salt-minion index e8cd25f..a91ab7b 100644 --- a/salt-minion +++ b/salt-minion @@ -64,7 +64,7 @@ start() { RETVAL=0 fi else - if [ $(pidofproc $PROCESS) ]; then + if [[ ! -z "$(pidofproc -p /var/run/$SERVICE.pid $PROCESS)" ]]; then RETVAL=$? echo -n "already running" else diff --git a/salt.spec b/salt.spec index b56a319..b9a6e23 100644 --- a/salt.spec +++ b/salt.spec @@ -5,7 +5,7 @@ %define __python %{_bindir}/python%{?pybasever} %endif -%global include_tests 1 +%global include_tests 0 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -15,7 +15,7 @@ %define _salttesting_ver 0.5.4 Name: salt -Version: 0.17.5 +Version: 2014.1.1 Release: 1%{?dist} Summary: A parallel remote execution system @@ -69,6 +69,8 @@ BuildRequires: python-unittest2 # https://github.com/saltstack/salt/issues/3749 BuildRequires: python-mock BuildRequires: git + +Requires: python-libcloud %endif BuildRequires: m2crypto @@ -199,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT %files -n salt-master %defattr(-,root,root) %doc %{_mandir}/man1/salt.1.* +%doc %{_mandir}/man1/salt-cloud.1.* %doc %{_mandir}/man1/salt-cp.1.* %doc %{_mandir}/man1/salt-key.1.* %doc %{_mandir}/man1/salt-master.1.* @@ -206,6 +209,7 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/salt-ssh.1.* %doc %{_mandir}/man1/salt-syndic.1.* %{_bindir}/salt +%{_bindir}/salt-cloud %{_bindir}/salt-cp %{_bindir}/salt-key %{_bindir}/salt-master @@ -318,6 +322,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Mar 21 2014 Erik Johnson - 2014.1.1-1 +- Update to bugfix release 2014.1.1 + +* Thu Feb 20 2014 Erik Johnson - 2014.1.0-1 +- Update to feature release 2014.1.0 + * Mon Jan 27 2014 Erik Johnson - 0.17.5-1 - Update to bugfix release 0.17.5 diff --git a/sources b/sources index 84d1d92..3fb50c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,9 @@ -1c9647b743c83b73572206e029f1a43f salt-0.17.5.tar.gz +c5c3ed043ad81cd71aff067c4e44d596 salt-2014.1.1.tar.gz f6ea7c5cc6600035bee122dae8225f4b SaltTesting-0.5.4.tar.gz +bb430c342bcf152a2eab4926005a1cd3 README.fedora +7ea2a1ce8fefec682cd89b619db39525 salt-master +3be813f49bf5ab9580cfc23e915eea4b salt-master.service +353763201289d2fc57d53263c4dad524 salt-minion +8ef6ab9bf9750f146d31bd8da9da963b salt-minion.service +9dd4f6cdd608f8bca63f9a5b7655073b salt-syndic +97e1daa0f7232f48d109b62890b68d0e salt-syndic.service