From 8c35c23776d3db5d9071ec6db2af220f7f2537ce1d42fa14314bd0deaca7c57a Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 4 Oct 2019 12:40:17 +0000 Subject: [PATCH] Accepting request 734966 from home:jengelh:branches:Base:System - Combine multiple %service_* to reduce generated boilerplate. OBS-URL: https://build.opensuse.org/request/show/734966 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=275 --- bluez.changes | 5 +++++ bluez.spec | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bluez.changes b/bluez.changes index a4fa0f6..45fec6a 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 4 10:50:15 UTC 2019 - Jan Engelhardt + +- Combine multiple %service_* to reduce generated boilerplate. + ------------------------------------------------------------------- Fri Oct 4 09:35:44 UTC 2019 - Stefan Seyfried diff --git a/bluez.spec b/bluez.spec index de03e9d..b0a4766 100644 --- a/bluez.spec +++ b/bluez.spec @@ -229,25 +229,22 @@ make check V=0 %endif %pre -%service_add_pre bluetooth.service -%service_add_pre bluetooth-mesh.service +%service_add_pre bluetooth.service bluetooth-mesh.service %post %{?udev_rules_update:%udev_rules_update} # todo: check if this is still obeyed / needed with systemd %{fillup_only -n bluetooth} # We need the bluez systemd service enabled at any time. It won't start up -# on it's own, as it is triggered by udev in the end (bnc#796671) +# on its own, as it is triggered by udev in the end (bnc#796671) /bin/systemctl enable bluetooth.service 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || : %preun -%service_del_preun bluetooth.service -%service_del_preun bluetooth-mesh.service +%service_del_preun bluetooth.service bluetooth-mesh.service %postun -%service_del_postun bluetooth.service -%service_del_postun bluetooth-mesh.service +%service_del_postun bluetooth.service bluetooth-mesh.service %post -n libbluetooth3 -p /sbin/ldconfig %postun -n libbluetooth3 -p /sbin/ldconfig