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

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

Browse Source 
- 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
This commit is contained in:
Stefan Seyfried 2019-10-04 12:40:17 +00:00 committed by Git OBS Bridge
parent 1712502138
commit 8c35c23776
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bluez.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 4 10:50:15 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Combine multiple %service_* to reduce generated boilerplate.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 4 09:35:44 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com> Fri Oct 4 09:35:44 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>

11
bluez.spec
View File

@ -229,25 +229,22 @@ make check V=0
%endif %endif
%pre %pre
%service_add_pre bluetooth.service %service_add_pre bluetooth.service bluetooth-mesh.service
%service_add_pre bluetooth-mesh.service
%post %post
%{?udev_rules_update:%udev_rules_update} %{?udev_rules_update:%udev_rules_update}
# todo: check if this is still obeyed / needed with systemd # todo: check if this is still obeyed / needed with systemd
%{fillup_only -n bluetooth} %{fillup_only -n bluetooth}
# We need the bluez systemd service enabled at any time. It won't start up # 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 enable bluetooth.service 2>&1 || :
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
%preun %preun
%service_del_preun bluetooth.service %service_del_preun bluetooth.service bluetooth-mesh.service
%service_del_preun bluetooth-mesh.service
%postun %postun
%service_del_postun bluetooth.service %service_del_postun bluetooth.service bluetooth-mesh.service
%service_del_postun bluetooth-mesh.service
%post -n libbluetooth3 -p /sbin/ldconfig %post -n libbluetooth3 -p /sbin/ldconfig
%postun -n libbluetooth3 -p /sbin/ldconfig %postun -n libbluetooth3 -p /sbin/ldconfig