Selaa lähdekoodia

postfix-3.6.4-1

Tomohiro "Tomo-p" KATO 2 vuotta sitten
vanhempi
commit
52b362b4aa
1 muutettua tiedostoa jossa 32 lisäystä ja 11 poistoa
  1. 32 11
      p/postfix/postfix-vl.spec

+ 32 - 11
p/postfix/postfix-vl.spec

@@ -31,7 +31,7 @@
 Summary:        Postfix Mail Transport Agent
 Summary(ja):    Postfix メールトランスポートエージェント
 Name:           postfix
-Version:        3.6.3
+Version:        3.6.4
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
@@ -372,6 +372,14 @@ getent group mail >/dev/null || \
 getent passwd %{postfix_user} >/dev/null || \
 	%{_sbindir}/useradd -d %{postfix_queue_dir} -s /sbin/nologin \
 	-g %{postfix_group} -G mail -M -r -u %{postfix_uid} %{postfix_user} 2>/dev/null
+
+%if !%{with systemd}
+rm -f /tmp/postfix.restart
+if [ -f /var/lock/subsys/postfix ]; then
+	%{_sysconfdir}/rc.d/init.d/postfix stop
+	touch /tmp/postfix.restart
+fi
+%endif
 exit 0
 
 %post
@@ -418,20 +426,30 @@ fi
 %systemd_postun_with_restart %{name}.service
 %else
 if [ -f %{_var}/lock/subsys/postfix ]; then
-   if [ $1 -eq 0 ]; then
-        rm -rf %{_var}/lock/subsys/postfix
-   else
-        %{_sysconfdir}/rc.d/init.d/postfix restart
-   fi
+	if [ $1 -eq 0 ]; then
+		rm -rf %{_var}/lock/subsys/postfix
+	else
+		if [ -f /tmp/postfix.restart ]; then
+			if [ -f %{_sysconfdir}/rc.d/init.d/postfix ]; then
+				%{_sysconfdir}/rc.d/init.d/postfix start
+			fi
+			rm -f /tmp/postfix.restart
+		fi
+	fi
 fi
 %endif
 
-%triggerpostun -- postfix < 3.1.0
-if [ -f %{_var}/lock/subsys/postfix ]; then
-   if [ $2 -gt 0 ]; then
-        %{_sysconfdir}/rc.d/init.d/postfix restart
-   fi
+%if !%{with systemd}
+%triggerpostun -- postfix < 3.6.4
+if [ $2 -gt 0 ]; then
+	if [ -f /tmp/postfix.restart ]; then
+		if [ -f %{_sysconfdir}/rc.d/init.d/postfix ]; then
+			%{_sysconfdir}/rc.d/init.d/postfix start
+		fi
+		rm -f /tmp/postfix.restart
+	fi
 fi
+%endif
 
 
 %clean
@@ -564,6 +582,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 19 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.4-1
+- new upstream release.
+
 * Tue Nov 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.3-1
 - new upstream release.