From ce5a76d70bb54fbade07697819614b1a5819cb9050536a97a00c7c29e0177bca Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 15 Dec 2020 09:12:34 +0000 Subject: [PATCH 1/2] Accepting request 855950 from home:gladiac:mailman3 - Add missing services and timers to systemd OBS-URL: https://build.opensuse.org/request/show/855950 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=33 --- python-mailman.changes | 5 +++++ python-mailman.spec | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/python-mailman.changes b/python-mailman.changes index 1030488..11abb0e 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 15 08:57:37 UTC 2020 - Andreas Schneider + +- Add missing services and timers to systemd + ------------------------------------------------------------------- Sat Nov 28 17:49:08 UTC 2020 - Michael Ströder diff --git a/python-mailman.spec b/python-mailman.spec index 421b104..a3d0992 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -209,20 +209,28 @@ 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 +%service_add_pre %{mailman_name}.service \ + %{mailman_name}-digest.service \ + %{mailman_name}-digest.timer %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 +%service_add_post %{mailman_name}.service \ + %{mailman_name}-digest.service \ + %{mailman_name}-digest.timer %preun -%service_del_preun %{mailman_name}.service +%service_del_preun %{mailman_name}.service \ + %{mailman_name}-digest.service \ + %{mailman_name}-digest.timer %postun -%service_del_postun %{mailman_name}.service +%service_del_postun %{mailman_name}.service \ + %{mailman_name}-digest.service \ + %{mailman_name}-digest.timer %python_uninstall_alternative master %python_uninstall_alternative mailman %python_uninstall_alternative runner From ad7d6e95706b9e392c8e8baba6e1647495e431ca18e9b722dcddff4f32973610 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 15 Dec 2020 10:04:54 +0000 Subject: [PATCH 2/2] 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 --- python-mailman.changes | 5 +++++ python-mailman.spec | 18 ++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) 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