SHA256
1
0
forked from pool/Jamulus

Accepting request 865534 from home:jengelh:branches:multimedia:apps

- Do not ignore errors from useradd.
- Reduce scriptlet boilerplate generated by %service_*.
- Cease removing users at package deinstallation.

OBS-URL: https://build.opensuse.org/request/show/865534
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/Jamulus?expand=0&rev=35
This commit is contained in:
2021-01-22 03:47:57 +00:00
committed by Git OBS Bridge
parent 8a6ff11f7d
commit 1325583200
2 changed files with 14 additions and 29 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 22 02:08:02 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Do not ignore errors from useradd.
- Reduce scriptlet boilerplate generated by %service_*.
- Cease removing users at package deinstallation.
-------------------------------------------------------------------
Thu Jan 14 10:49:11 UTC 2021 - ecsos <ecsos@opensuse.org>

View File

@@ -121,43 +121,21 @@ install -D -m 0644 distributions/jamulus.desktop.in %{buildroot}%{_datadir}/appl
%fdupes %{buildroot}%{_datadir}
%pre
%service_add_pre jamulus-public.service
%service_add_pre jamulus-private.service
%service_add_pre jamulus-newrec.service
%service_add_pre jamulus-togglerec.service
if
getent passwd jamulus >/dev/null
then
: OK user jamulus already present.
else
useradd -r -g nogroup -d /var/lib/empty -s /bin/false -c "Jamulus Server" jamulus 2> /dev/null || :
fi
%service_add_pre jamulus-public.service jamulus-private.service jamulus-newrec.service jamulus-togglerec.service
getent passwd jamulus >/dev/null || \
useradd -r -g nogroup -d /var/lib/empty -s /bin/false \
-c "Jamulus Server" jamulus
%post
%service_add_post jamulus-public.service
%service_add_post jamulus-private.service
%service_add_post jamulus-newrec.service
%service_add_post jamulus-togglerec.service
%service_add_post jamulus-public.service jamulus-private.service jamulus-newrec.service jamulus-togglerec.service
%{fillup_only -n jamulus}
%firewalld_reload
%preun
%service_del_preun jamulus-public.service
%service_del_preun jamulus-private.service
%service_del_preun jamulus-newrec.service
%service_del_preun jamulus-togglerec.service
%service_del_preun jamulus-public.service jamulus-private.service jamulus-newrec.service jamulus-togglerec.service
%postun
%service_del_postun jamulus-public.service
%service_del_postun jamulus-private.service
%service_del_postun jamulus-newrec.service
%service_del_postun jamulus-togglerec.service
if [ $1 -eq 0 ]; then
%{_sbindir}/userdel jamulus
rm -rf %{_sysconfdir}/sysconfig/jamulus
else
true
fi
%service_del_postun jamulus-public.service jamulus-private.service jamulus-newrec.service jamulus-togglerec.service
%files
%doc README.md ChangeLog README.SUSE