Accepting request 827843 from games:tools

OBS-URL: https://build.opensuse.org/request/show/827843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mumble?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2020-08-19 16:59:31 +00:00 committed by Git OBS Bridge
commit 05add0286c
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 19 09:24:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Consistently use %{_tmpfilesdir} instead of abusing
%{_libexecdir}/tmpfiles.d.
-------------------------------------------------------------------
Sat Jul 11 18:06:46 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -266,8 +266,8 @@ install -m 644 release/libcelt0.so.0.*.* "%{buildroot}%{_libdir}/mumble"
# server
install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd"
%if %{with systemd}
mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d
cat >> %{buildroot}%{_libexecdir}/tmpfiles.d/mumble-server.conf <<EOF
mkdir -p %{buildroot}%{_tmpfilesdir}
cat >> %{buildroot}%{_tmpfilesdir}/mumble-server.conf <<EOF
d %{_localstatedir}/run/mumble-server 0755 mumble-server mumble-server -
EOF
#
@ -330,7 +330,7 @@ getent passwd mumble-server >/dev/null || \
%post server
%if %{with systemd}
systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/mumble-server.conf || true
systemd-tmpfiles --create %{_tmpfilesdir}/mumble-server.conf || true
%service_add_post mumble-server.service
%else
%fillup_and_insserv mumble-server
@ -364,8 +364,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/mumble-server.conf || true
%config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf
%config(noreplace) %{_sysconfdir}/mumble-server.ini
%if %{with systemd}
%dir %{_libexecdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/mumble-server.conf
%{_tmpfilesdir}/mumble-server.conf
%{_unitdir}/mumble-server.service
%else
%{_initddir}/mumble-server