From 3e50bd762ee0bbf413fa0e9889c4703bca76eeed4b5cb1803d88e9955949e0b1 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 18 Mar 2019 09:57:36 +0000 Subject: [PATCH] Accepting request 685864 from home:jengelh:branches:Base:System - Join %service_* lines to generate less scriptlet boilerplate. OBS-URL: https://build.opensuse.org/request/show/685864 OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=108 --- sensors.changes | 5 +++++ sensors.spec | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sensors.changes b/sensors.changes index 8405cbc..e713450 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 3 19:32:47 UTC 2019 - Jan Engelhardt + +- Join %service_* lines to generate less scriptlet boilerplate. + ------------------------------------------------------------------- Wed Dec 19 14:47:35 UTC 2018 - jdelvare@suse.com diff --git a/sensors.spec b/sensors.spec index 2c5ad9f..a08d1cd 100644 --- a/sensors.spec +++ b/sensors.spec @@ -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