diff --git a/salt-2014.1.10.tar.gz b/salt-2014.1.10.tar.gz new file mode 100644 index 0000000..41408e0 --- /dev/null +++ b/salt-2014.1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f175fc0385849fe557c0c91b0331926dacd665ae0ba3aa0d585bd7670d13edc5 +size 2813318 diff --git a/salt-2014.1.8.tar.gz b/salt-2014.1.8.tar.gz deleted file mode 100644 index 263f89f..0000000 --- a/salt-2014.1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edba124cb41aff52f6ac348c04bfac2dec2c70d530056f91ef0b31cae639c6bb -size 2812870 diff --git a/salt.changes b/salt.changes index 55161bc..cb42397 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 4 16:12:14 UTC 2014 - aboe76@gmail.com + +- RPM spec update + + added service_add_pre function + +------------------------------------------------------------------- +Fri Aug 1 19:41:12 UTC 2014 - aboe76@gmail.com + +- Updated to 2014.1.10: + + Version 2014.1.9 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.9. + + Version 2014.1.8 contained a regression which caused inaccurate Salt version + detection, and thus was never packaged for general release. This version + contains the version detection fix, but is otherwise identical to 2014.1.8. + ------------------------------------------------------------------- Wed Jul 30 20:22:09 UTC 2014 - aboe76@gmail.com diff --git a/salt.spec b/salt.spec index a68eaaf..ae7cb81 100644 --- a/salt.spec +++ b/salt.spec @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.8 +Version: 2014.1.10 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 @@ -314,6 +314,11 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}" %stop_on_removal salt-syndic %endif +%pre syndic +%if 0%{?_unitdir:1} +%service_add_pre salt-syndic.service +%endif + %post syndic %if 0%{?_unitdir:1} %service_add_post salt-syndic.service @@ -337,6 +342,11 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}" %stop_on_removal salt-master %endif +%pre master +%if 0%{?_unitdir:1} +%service_add_pre salt-master.service +%endif + %post master %if 0%{?_unitdir:1} %service_add_post salt-master.service @@ -360,6 +370,11 @@ install -Dpm 0644 pkg/salt.bash "%{buildroot}/etc/bash_completion.d/%{name}" %stop_on_removal salt-minion %endif +%pre minion +%if 0%{?_unitdir:1} +%service_add_pre salt-minion.service +%endif + %post minion %if 0%{?_unitdir:1} %service_add_post salt-minion.service diff --git a/use-forking-daemon.patch b/use-forking-daemon.patch index 61c05b0..3e95e58 100644 --- a/use-forking-daemon.patch +++ b/use-forking-daemon.patch @@ -1,7 +1,7 @@ Index: salt-2014.1.8/pkg/salt-master.service =================================================================== ---- salt-2014.1.8.orig/pkg/salt-master.service -+++ salt-2014.1.8/pkg/salt-master.service +--- salt-2014.1.10.orig/pkg/salt-master.service ++++ salt-2014.1.10/pkg/salt-master.service @@ -3,8 +3,10 @@ Description=The Salt Master Server After=syslog.target network.target