rpm/pcp
SHA256
1
0
Fork 0
forked from pool/pcp
Code Pull Requests Activity

Accepting request 663748 from home:jengelh:branches:Base:System

Browse Source 
- Combine systemd service calls to save on macro
  generated boilerplate.

OBS-URL: https://build.opensuse.org/request/show/663748
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=66
This commit is contained in:
David Disseldorp 2019-01-08 15:51:40 +00:00 committed by Git OBS Bridge
parent e303564cab
commit 11e58cbd92
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 8 14:54:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Combine systemd service calls to save on macro
generated boilerplate.
-------------------------------------------------------------------
Mon Jan 7 15:36:54 UTC 2019 - ddiss@suse.com

39
pcp.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -2520,15 +2520,8 @@ if [ "$1" -eq 0 ]
then
# stop daemons before erasing the package
%if !%{disable_systemd}
systemctl --no-reload disable pmlogger.service >/dev/null 2>&1
systemctl --no-reload disable pmie.service >/dev/null 2>&1
systemctl --no-reload disable pmproxy.service >/dev/null 2>&1
systemctl --no-reload disable pmcd.service >/dev/null 2>&1
systemctl stop pmlogger.service >/dev/null 2>&1
systemctl stop pmie.service >/dev/null 2>&1
systemctl stop pmproxy.service >/dev/null 2>&1
systemctl stop pmcd.service >/dev/null 2>&1
systemctl --no-reload disable pmlogger pmie pmproxy pmcd >/dev/null 2>&1
systemctl stop pmlogger pmie pmproxy pmcd >/dev/null 2>&1
%else
/sbin/service pmlogger stop >/dev/null 2>&1
/sbin/service pmie stop >/dev/null 2>&1
@ -2653,17 +2646,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%{fillup_only -n pmcd}
%{fillup_only -n pmlogger}
%{fillup_only -n pmproxy}
%service_add_post pmcd
%service_add_post pmlogger
%service_add_post pmie
%service_add_post pmproxy
%service_add_post pmie_check.timer
%service_add_post pmie_daily.timer
%service_add_post pmlogger_daily.timer
%service_add_post pmlogger_daily_check.timer
%service_add_post pmlogger_daily_poll.timer
%service_add_post pmlogger_daily_report.timer
%service_add_post pmlogger_daily_report_poll.timer
%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_daily_check.timer pmlogger_daily_poll.timer pmlogger_daily_report.timer pmlogger_daily_report_poll.timer
%else
%{fillup_and_insserv pmcd}
%{fillup_and_insserv pmlogger}
@ -2672,10 +2655,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%endif
%else
%if !%{disable_systemd}
systemctl condrestart pmcd.service >/dev/null 2>&1
systemctl condrestart pmlogger.service >/dev/null 2>&1
systemctl condrestart pmie.service >/dev/null 2>&1
systemctl condrestart pmproxy.service >/dev/null 2>&1
systemctl condrestart pmcd pmlogger pmie pmproxy >/dev/null 2>&1
%else
/sbin/chkconfig --add pmcd >/dev/null 2>&1
/sbin/service pmcd condrestart
@ -2746,14 +2726,7 @@ fi
%postun
/sbin/ldconfig
%if !%{disable_systemd}
%service_del_postun pmcd pmlogger pmproxy pmie
%service_del_postun pmie_check.timer
%service_del_postun pmie_daily.timer
%service_del_postun pmlogger_daily.timer
%service_del_postun pmlogger_daily_check.timer
%service_del_postun pmlogger_daily_poll.timer
%service_del_postun pmlogger_daily_report.timer
%service_del_postun pmlogger_daily_report_poll.timer
%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_daily_check.timer pmlogger_daily_poll.timer pmlogger_daily_report.timer pmlogger_daily_report_poll.timer
%else
%{?restart_on_update:%{restart_on_update pcp pmproxy pmie}}
%{?insserv_cleanup:%{insserv_cleanup}}