Accepting request 686004 from Base:System

- Join %service_* lines to generate less scriptlet boilerplate. (forwarded request 685864 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/686004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2019-03-27 15:11:40 +00:00 committed by Git OBS Bridge
commit 130401fc92
2 changed files with 10 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Mar 3 19:32:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Join %service_* lines to generate less scriptlet boilerplate.
-------------------------------------------------------------------
Wed Dec 19 14:47:35 UTC 2018 - jdelvare@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sensors
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -137,11 +137,9 @@ make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} M
cp -a %{SOURCE1} %{buildroot}/%{_fillupdir}
%pre
%service_add_pre lm_sensors.service
%service_add_pre fancontrol.service
%service_add_pre lm_sensors.service fancontrol.service
%post
%service_add_post lm_sensors.service
sh -c '
CONFIG=%{_sysconfdir}/sysconfig/lm_sensors
test -r "$CONFIG" || exit 0
@ -164,15 +162,13 @@ echo "HWMON_MODULES=\"$HWMON_MODULES\"" >> "$CONFIG"
if test -e %{_sysconfdir}/modprobe.d/lm_sensors -a ! -e %{_sysconfdir}/modprobe.d/lm_sensors.conf ; then
mv -f %{_sysconfdir}/modprobe.d/lm_sensors %{_sysconfdir}/modprobe.d/lm_sensors.conf
fi
%service_add_post fancontrol.service
%service_add_post lm_sensors.service fancontrol.service
%preun
%service_del_preun fancontrol.service
%service_del_preun lm_sensors.service
%service_del_preun fancontrol.service lm_sensors.service
%postun
%service_del_postun fancontrol.service
%service_del_postun lm_sensors.service
%service_del_postun fancontrol.service lm_sensors.service
%pre -n sensord
%service_add_pre sensord.service