diff --git a/.gitignore b/.gitignore index cc3dd1a..077e0db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /amavis-v2.12.0.tar.bz2 +/amavis-v2.12.3.tar.bz2 diff --git a/amavis.spec b/amavis.spec index a3203b8..79ac24f 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,7 +1,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.12.0 -Release: 9%{?dist} +Version: 2.12.3 +Release: 1%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -215,6 +215,34 @@ exit 0 %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd +%triggerprein -- amavisd-new < 2.12.0-3 +systemctl --quiet is-enabled amavisd.service && touch %{_rundir}/amavisd/amavisd.enabled || : +systemctl --quiet is-active amavisd.service && touch %{_rundir}/amavisd/amavisd.running || : + +%triggerpostun -- amavisd-new < 2.12.0-3 +if [ -f %{_rundir}/amavisd/amavisd.enabled ]; then + systemctl enable amavisd.service >/dev/null 2>&1 || : + rm -f %{_rundir}/amavisd/amavisd.enabled +fi +if [ -f %{_rundir}/amavisd/amavisd.running ]; then + systemctl start amavisd.service >/dev/null 2>&1 || : + rm -f %{_rundir}/amavisd/amavisd.running +fi + +%triggerprein snmp -- amavisd-new-snmp < 2.12.0-3 +systemctl --quiet is-enabled amavisd-snmp.service && touch %{_rundir}/amavisd/amavisd-snmp.enabled || : +systemctl --quiet is-active amavisd-snmp.service && touch %{_rundir}/amavisd/amavisd-snmp.running || : + +%triggerpostun snmp -- amavisd-new-snmp < 2.12.0-3 +if [ -f %{_rundir}/amavisd/amavisd-snmp.enabled ]; then + systemctl enable amavisd-snmp.service >/dev/null 2>&1 || : + rm -f %{_rundir}/amavisd/amavisd-snmp.enabled +fi +if [ -f %{_rundir}/amavisd/amavisd-snmp.running ]; then + systemctl start amavisd-snmp.service >/dev/null 2>&1 || : + rm -f %{_rundir}/amavisd/amavisd-snmp.running +fi + %files snmp %doc AMAVIS-MIB.txt %{_unitdir}/amavisd-snmp.service @@ -226,6 +254,12 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Thu Mar 14 2024 Juan Orti Alcaine - 2.12.3-1 +- Update to version 2.12.3 + +* Fri Sep 18 2020 Juan Orti Alcaine - 2.12.0-10 +- Don't disable service after obsoleting amavisd-new (RHBZ#1875299) + * Tue Aug 18 2020 Juan Orti Alcaine - 2.12.0-9 - Drop unused dependency: perl(Digest::SHA1) - Make optional: perl(Convert::TNEF), perl(Convert::UUlib) diff --git a/sources b/sources index b60fc05..29667d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.12.0.tar.bz2) = f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844 +SHA512 (amavis-v2.12.3.tar.bz2) = edb0de71f3c058e47d1ea9b261b1f8d2525c3718b53b8f19130d36b676c2f50eb5a50d878c06f36080f49984f0ba4e5c8b166aab5f4980c61ea7024e801d5369