diff --git a/python-mailman.changes b/python-mailman.changes index 11abb0e..4bbced2 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 15 09:19:44 UTC 2020 - Andreas Schneider + +- Fix systemd services + ------------------------------------------------------------------- Tue Dec 15 08:57:37 UTC 2020 - Andreas Schneider diff --git a/python-mailman.spec b/python-mailman.spec index a3d0992..ac81289 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -26,6 +26,8 @@ %define mailman_rundir %{_rundir}/%{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} %if "%{flavor}" == "test" %define psuffix -test @@ -209,28 +211,20 @@ getent passwd %{mailman_user} >/dev/null || \ %{_sbindir}/useradd -r -g %{mailman_group} -s /sbin/nologin \ -c "mailman daemon user" -d %{mailman_homedir} %{mailman_user} %{_sbindir}/usermod -g %{mailman_group} %{mailman_user} >/dev/null -%service_add_pre %{mailman_name}.service \ - %{mailman_name}-digest.service \ - %{mailman_name}-digest.timer +%service_add_pre %{mailman_services} %post %python_install_alternative master %python_install_alternative mailman %python_install_alternative runner %tmpfiles_create %{_tmpfilesdir}/%{mailman_name}.conf -%service_add_post %{mailman_name}.service \ - %{mailman_name}-digest.service \ - %{mailman_name}-digest.timer +%service_add_post %{mailman_services} %preun -%service_del_preun %{mailman_name}.service \ - %{mailman_name}-digest.service \ - %{mailman_name}-digest.timer +%service_del_preun %{mailman_services} %postun -%service_del_postun %{mailman_name}.service \ - %{mailman_name}-digest.service \ - %{mailman_name}-digest.timer +%service_del_postun %{mailman_services} %python_uninstall_alternative master %python_uninstall_alternative mailman %python_uninstall_alternative runner