diff --git a/.gitignore b/.gitignore index 410f065..8a7c58a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ /salt-minion.service /salt-syndic /salt-syndic.service +/salt-2014.1.3.tar.gz +/fix-setup-py.patch diff --git a/salt-master.service b/salt-master.service index 4f3827e..65944f3 100644 --- a/salt-master.service +++ b/salt-master.service @@ -3,7 +3,7 @@ Description=The Salt Master Server After=syslog.target network.target [Service] -Type=simple +Type=Notify ExecStart=/usr/bin/salt-master [Install] diff --git a/salt.spec b/salt.spec index b9a6e23..1bd4cf5 100644 --- a/salt.spec +++ b/salt.spec @@ -15,7 +15,7 @@ %define _salttesting_ver 0.5.4 Name: salt -Version: 2014.1.1 +Version: 2014.1.3 Release: 1%{?dist} Summary: A parallel remote execution system @@ -31,6 +31,7 @@ Source5: %{name}-master.service Source6: %{name}-syndic.service Source7: %{name}-minion.service Source8: README.fedora +Patch0: fix-setup-py.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -138,6 +139,8 @@ Salt minion is queried and controlled from the master. %prep %setup -c +cd %{name}-%{version} +%patch0 -p1 %setup -T -D -a 1 %build @@ -322,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Apr 18 2014 Erik Johnson - 2014.1.3-1 +- Update to bugfix release 2014.1.3 + * Fri Mar 21 2014 Erik Johnson - 2014.1.1-1 - Update to bugfix release 2014.1.1 diff --git a/sources b/sources index 3fb50c0..2dee91d 100644 --- a/sources +++ b/sources @@ -1,9 +1,10 @@ -c5c3ed043ad81cd71aff067c4e44d596 salt-2014.1.1.tar.gz +e9d0e19b6a326f99c210f86ae72a7c3d salt-2014.1.3.tar.gz f6ea7c5cc6600035bee122dae8225f4b SaltTesting-0.5.4.tar.gz bb430c342bcf152a2eab4926005a1cd3 README.fedora 7ea2a1ce8fefec682cd89b619db39525 salt-master -3be813f49bf5ab9580cfc23e915eea4b salt-master.service +f66118a624fc7cbc5bcf01051c69e83a salt-master.service 353763201289d2fc57d53263c4dad524 salt-minion 8ef6ab9bf9750f146d31bd8da9da963b salt-minion.service 9dd4f6cdd608f8bca63f9a5b7655073b salt-syndic 97e1daa0f7232f48d109b62890b68d0e salt-syndic.service +ae758da300e33cab7dd797709fe0982a fix-setup-py.patch