rpms/torque
7
0
Fork 0
Code Issues Pull Requests Releases Activity

more slight changes merging between branches

Browse Source
This commit is contained in:
David Brown 2015-06-14 09:48:17 -07:00
parent 9b4b8503e0
commit 3d05f30e84
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
torque.spec
View File

@ -531,6 +531,21 @@ __EOF__
fi fi
done done
done done
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_post trqauthd.service
%else
/sbin/chkconfig --add trqauthd
%endif
%preun
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_preun trqauthd.service
%else
if [ $1 -eq 0 ]; then
/sbin/service trqauthd stop >/dev/null 2>&1
/sbin/chkconfig --del trqauthd
fi
%endif
%posttrans client %posttrans client
/usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \ /usr/sbin/alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-torque 10 \
@ -603,22 +618,17 @@ fi
%post server %post server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_post pbs_server.service %systemd_post pbs_server.service
%systemd_post trqauthd.service
%else %else
/sbin/chkconfig --add pbs_server /sbin/chkconfig --add pbs_server
/sbin/chkconfig --add trqauthd
%endif %endif
%preun server %preun server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%systemd_preun pbs_server.service %systemd_preun pbs_server.service
%systemd_preun trqauthd.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
/sbin/service pbs_server stop >/dev/null 2>&1 /sbin/service pbs_server stop >/dev/null 2>&1
/sbin/service trqauthd stop >/dev/null 2>&1
/sbin/chkconfig --del pbs_server /sbin/chkconfig --del pbs_server
/sbin/chkconfig --del trqauthd
fi fi
%endif %endif
@ -639,6 +649,12 @@ fi
%config(noreplace) %{_sysconfdir}/torque/pbs_environment %config(noreplace) %{_sysconfdir}/torque/pbs_environment
%config(noreplace) %{_sysconfdir}/torque/server_name %config(noreplace) %{_sysconfdir}/torque/server_name
%{_mandir}/man1/pbs.1.* %{_mandir}/man1/pbs.1.*
%attr(0755, root, root) %{_sbindir}/trqauthd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/trqauthd.service
%else
%{_initrddir}/trqauthd
%endif
%files client %files client
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -835,12 +851,6 @@ fi
%else %else
%{_initrddir}/pbs_server %{_initrddir}/pbs_server
%endif %endif
%attr(0755, root, root) %{_sbindir}/trqauthd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/trqauthd.service
%else
%{_initrddir}/trqauthd
%endif
%dir %{_var}/log/torque/server_logs %dir %{_var}/log/torque/server_logs
%{torquehomedir}/server_logs %{torquehomedir}/server_logs
%{torquehomedir}/server_priv %{torquehomedir}/server_priv