valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed naming to conform to standard

Browse Source
This commit is contained in:
Andrew Niemantsverdriet 2013-02-20 11:57:38 -07:00
parent 2fc86183b4
commit de1e9fc7a7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpm/salt-api.spec
View File

@ -1,6 +1,5 @@
%if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12) %if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12)
%global with_python26 1 %global with_python26 1
%global include_tests 0
%define pybasever 2.6 %define pybasever 2.6
%define __python_ver 26 %define __python_ver 26
%define __python %{_bindir}/python%{?pybasever} %define __python %{_bindir}/python%{?pybasever}
@ -79,8 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE %doc LICENSE
%{python_sitelib}/%{name}/* %{_bindir}/%{name}
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info %{python_sitelib}/saltapi/*
%{python_sitelib}/salt_api-%{version}-py?.?.egg-info
%doc %{_mandir}/man1/salt-api.1.* %doc %{_mandir}/man1/salt-api.1.*
%doc %{_mandir}/man7/salt-api.7.* %doc %{_mandir}/man7/salt-api.7.*
@ -94,23 +94,23 @@ rm -rf $RPM_BUILD_ROOT
# not sure if RHEL 7 will use systemd yet # not sure if RHEL 7 will use systemd yet
%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) %if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
%preun -n salt-api %preun
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
/sbin/service salt-api stop >/dev/null 2>&1 /sbin/service salt-api stop >/dev/null 2>&1
/sbin/chkconfig --del salt-api /sbin/chkconfig --del salt-api
fi fi
%post -n salt-api %post
/sbin/chkconfig --add salt-api /sbin/chkconfig --add salt-api
%postun -n salt-api %postun
if [ "$1" -ge "1" ] ; then if [ "$1" -ge "1" ] ; then
/sbin/service salt-api condrestart >/dev/null 2>&1 || : /sbin/service salt-api condrestart >/dev/null 2>&1 || :
fi fi
%else %else
%preun -n salt-api %preun
%if 0%{?systemd_preun:1} %if 0%{?systemd_preun:1}
%systemd_preun salt-api.service %systemd_preun salt-api.service
%else %else
@ -121,14 +121,14 @@ rm -rf $RPM_BUILD_ROOT
fi fi
%endif %endif
%post -n salt-api %post
%if 0%{?systemd_post:1} %if 0%{?systemd_post:1}
%systemd_post salt-api.service %systemd_post salt-api.service
%else %else
/bin/systemctl daemon-reload &>/dev/null || : /bin/systemctl daemon-reload &>/dev/null || :
%endif %endif
%postun -n salt-api %postun
%if 0%{?systemd_post:1} %if 0%{?systemd_post:1}
%systemd_postun salt-api.service %systemd_postun salt-api.service
%else %else