Merge branch 'master' into f31

fail2ban.spec

@@ -1,6 +1,6 @@
 Name: fail2ban
 Version: 0.11.1
-Release: 9%{?dist}
+Release: 9%{?dist}.2
 Summary: Daemon to ban hosts that cause multiple authentication errors
 
 License: GPLv2+
@@ -36,7 +36,7 @@ Patch8: https://github.com/fail2ban/fail2ban/commit/309c8dddd7adc2de140ed5a72088
 BuildArch: noarch
 
 %if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires: python2-devel
+BuildRequires: python-devel
 # For testcases
 BuildRequires: python-inotify
 %else
@@ -86,7 +86,7 @@ SELinux policies for Fail2Ban.
 %package server
 Summary: Core server component for Fail2Ban
 %if 0%{?rhel} && 0%{?rhel} < 8
-Requires: python2-systemd
+Requires: systemd-python
 %else
 Requires: python3-systemd
 %endif
@@ -122,7 +122,7 @@ Requires: python-inotify
 # No python3 support for gamin so epel only
 Requires: gamin-python
 %else
-Requires: python2-inotify
+Requires: python3-inotify
 %endif
 Requires: /usr/bin/whois
 
@@ -390,6 +390,9 @@ fi
 
 
 %changelog
+* Tue Jul 28 2020 Richard Shaw <hobbes1069@gmail.com> - 0.11.1-9.2
+- Fix python2 requires for EPEL 7.
+
 * Mon Jul 27 2020 Richard Shaw <hobbes1069@gmail.com> - 0.11.1-9
 - Add conditonals back for EL 7 as it's being brought up to date.
 - Add patch to deal with nftables not accepting ":" as a port separator.