Merge branch 'f31' into epel7

fail2ban.spec

@@ -1,7 +1,7 @@
 Summary: Daemon to ban hosts that cause multiple authentication errors
 Name: fail2ban
 Version: 0.10.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://fail2ban.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -266,7 +266,10 @@ fi
 %config(noreplace) %{_sysconfdir}/fail2ban
 %exclude %{_sysconfdir}/fail2ban/action.d/complain.conf
 %exclude %{_sysconfdir}/fail2ban/action.d/hostsdeny.conf
-%exclude %{_sysconfdir}/fail2ban/action.d/mail-*.conf
+%exclude %{_sysconfdir}/fail2ban/action.d/mail.conf
+%exclude %{_sysconfdir}/fail2ban/action.d/mail-buffered.conf
+%exclude %{_sysconfdir}/fail2ban/action.d/mail-whois.conf
+%exclude %{_sysconfdir}/fail2ban/action.d/mail-whois-lines.conf
 %exclude %{_sysconfdir}/fail2ban/action.d/sendmail-*.conf
 %exclude %{_sysconfdir}/fail2ban/action.d/shorewall.conf
 %exclude %{_sysconfdir}/fail2ban/jail.d/*.conf
@@ -293,7 +296,10 @@ fi
 
 %files mail
 %config(noreplace) %{_sysconfdir}/fail2ban/action.d/complain.conf
-%config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail-*.conf
+%config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail.conf
+%config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail-buffered.conf
+%config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail-whois.conf
+%config(noreplace) %{_sysconfdir}/fail2ban/action.d/mail-whois-lines.conf
 
 %files sendmail
 %config(noreplace) %{_sysconfdir}/fail2ban/action.d/sendmail-*.conf
@@ -306,6 +312,9 @@ fi
 
 
 %changelog
+* Tue Jan 21 2020 Orion Poplawski <orion@nwra.com> - 0.10.5-2
+- Move action.d/mail-whois-common.conf into fail2ban-server
+
 * Tue Jan 14 2020 Orion Poplawski <orion@nwra.com> - 0.10.5-1
 - Update to 0.10.5