diff --git a/sendmail.spec b/sendmail.spec index 75ddc3c..924c325 100644 --- a/sendmail.spec +++ b/sendmail.spec @@ -11,8 +11,6 @@ %global spooldir %{_localstatedir}/spool %global maildir %{_sysconfdir}/mail -%global sysv2systemdnvr 8.14.5-3 - # hardened build if not overrided %{!?_hardened_build:%global _hardened_build 1} @@ -23,7 +21,7 @@ Summary: A widely used Mail Transport Agent (MTA) Name: sendmail Version: 8.15.1 -Release: 1%{?dist} +Release: 2%{?dist} License: Sendmail Group: System Environment/Daemons URL: http://www.sendmail.org/ @@ -554,21 +552,6 @@ fi %postun sysvinit [ "$1" -ge "1" ] && %{_initrddir}/sendmail condrestart >/dev/null 2>&1 ||: -%triggerun -- sendmail < %{sysv2systemdnvr} -%{_bindir}/systemd-sysv-convert --save sendmail >/dev/null 2>&1 ||: -/bin/systemctl enable sendmail.service >/dev/null 2>&1 -/bin/systemctl enable sm-client.service >/dev/null 2>&1 -/sbin/chkconfig --del sendmail >/dev/null 2>&1 || : -/bin/systemctl try-restart sendmail.service >/dev/null 2>&1 || : -/bin/systemctl try-restart sm-client.service >/dev/null 2>&1 || : -# workaround for systemd rhbz#738022 -/bin/systemctl is-active sendmail.service >/dev/null 2>&1 && \ - ! /bin/systemctl is-active sm-client.service >/dev/null 2>&1 && \ - /bin/systemctl start sm-client.service >/dev/null 2>&1 || : - -%triggerpostun -n sendmail-sysvinit -- sendmail < %{sysv2systemdnvr} -/sbin/chkconfig --add sendmail >/dev/null 2>&1 || : - %files %defattr(-,root,root,-) %dir %{_docdir}/sendmail @@ -697,6 +680,9 @@ fi %{_initrddir}/sendmail %changelog +* Thu Feb 26 2015 Jaroslav Škarvada - 8.15.1-2 +- Removed code for transition from sysv init to systemd (deprecated) + * Mon Dec 8 2014 Jaroslav Škarvada - 8.15.1-1 - New version - Dropped hesiod patch (not needed)