Accepting request 855964 from home:gladiac:mailman3

- Fix systemd services

OBS-URL: https://build.opensuse.org/request/show/855964
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=34
This commit is contained in:
Petr Gajdos 2020-12-15 10:04:54 +00:00 committed by Git OBS Bridge
parent ce5a76d70b
commit ad7d6e9570
2 changed files with 11 additions and 12 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 15 09:19:44 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
- Fix systemd services
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 15 08:57:37 UTC 2020 - Andreas Schneider <asn@cryptomilk.org> Tue Dec 15 08:57:37 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -26,6 +26,8 @@
%define mailman_rundir %{_rundir}/%{mailman_name} %define mailman_rundir %{_rundir}/%{mailman_name}
%define mailman_lockdir %{_rundir}/lock/%{mailman_name} %define mailman_lockdir %{_rundir}/lock/%{mailman_name}
%global mailman_services %{mailman_name}.service %{mailman_name}-digest.service %{mailman_name}-digest.timer
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test" %if "%{flavor}" == "test"
%define psuffix -test %define psuffix -test
@ -209,28 +211,20 @@ getent passwd %{mailman_user} >/dev/null || \
%{_sbindir}/useradd -r -g %{mailman_group} -s /sbin/nologin \ %{_sbindir}/useradd -r -g %{mailman_group} -s /sbin/nologin \
-c "mailman daemon user" -d %{mailman_homedir} %{mailman_user} -c "mailman daemon user" -d %{mailman_homedir} %{mailman_user}
%{_sbindir}/usermod -g %{mailman_group} %{mailman_user} >/dev/null %{_sbindir}/usermod -g %{mailman_group} %{mailman_user} >/dev/null
%service_add_pre %{mailman_name}.service \ %service_add_pre %{mailman_services}
%{mailman_name}-digest.service \
%{mailman_name}-digest.timer
%post %post
%python_install_alternative master %python_install_alternative master
%python_install_alternative mailman %python_install_alternative mailman
%python_install_alternative runner %python_install_alternative runner
%tmpfiles_create %{_tmpfilesdir}/%{mailman_name}.conf %tmpfiles_create %{_tmpfilesdir}/%{mailman_name}.conf
%service_add_post %{mailman_name}.service \ %service_add_post %{mailman_services}
%{mailman_name}-digest.service \
%{mailman_name}-digest.timer
%preun %preun
%service_del_preun %{mailman_name}.service \ %service_del_preun %{mailman_services}
%{mailman_name}-digest.service \
%{mailman_name}-digest.timer
%postun %postun
%service_del_postun %{mailman_name}.service \ %service_del_postun %{mailman_services}
%{mailman_name}-digest.service \
%{mailman_name}-digest.timer
%python_uninstall_alternative master %python_uninstall_alternative master
%python_uninstall_alternative mailman %python_uninstall_alternative mailman
%python_uninstall_alternative runner %python_uninstall_alternative runner