From 02a32ff76b6594ab4204d2ffeb2fe0a5372fb99b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 27 Jul 2020 20:43:58 -0500 Subject: [PATCH 1/4] Fix python2 requires for EPEL 7. --- fail2ban.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fail2ban.spec b/fail2ban.spec index 005729e..5e48fe0 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -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: python-systemd %else Requires: python3-systemd %endif From 7b1980d50fa14ae114af7d36dc8a9a4b33500b8e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 27 Jul 2020 20:44:30 -0500 Subject: [PATCH 2/4] Fix python2 requires for EPEL 7. --- fail2ban.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fail2ban.spec b/fail2ban.spec index 5e48fe0..d6df97f 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -1,6 +1,6 @@ Name: fail2ban Version: 0.11.1 -Release: 9%{?dist} +Release: 9%{?dist}.1 Summary: Daemon to ban hosts that cause multiple authentication errors License: GPLv2+ @@ -390,6 +390,9 @@ fi %changelog +* Tue Jul 28 2020 Richard Shaw - 0.11.1-9.1 +- Fix python2 requires for EPEL 7. + * Mon Jul 27 2020 Richard Shaw - 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. From e685f72cdac40bd3bbdeb1272338629c5abfac12 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 29 Jul 2020 07:51:20 -0500 Subject: [PATCH 3/4] Fix python2 requires for EPEL 7. --- fail2ban.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fail2ban.spec b/fail2ban.spec index d6df97f..48fa262 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -1,6 +1,6 @@ Name: fail2ban Version: 0.11.1 -Release: 9%{?dist}.1 +Release: 9%{?dist}.2 Summary: Daemon to ban hosts that cause multiple authentication errors License: GPLv2+ @@ -86,7 +86,7 @@ SELinux policies for Fail2Ban. %package server Summary: Core server component for Fail2Ban %if 0%{?rhel} && 0%{?rhel} < 8 -Requires: python-systemd +Requires: systemd-python %else Requires: python3-systemd %endif @@ -390,7 +390,7 @@ fi %changelog -* Tue Jul 28 2020 Richard Shaw - 0.11.1-9.1 +* Tue Jul 28 2020 Richard Shaw - 0.11.1-9.2 - Fix python2 requires for EPEL 7. * Mon Jul 27 2020 Richard Shaw - 0.11.1-9 From 28225b6487b8012d7113afd17fccb23b7c67ad07 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 6 Aug 2020 06:44:39 -0500 Subject: [PATCH 4/4] Fix python-inotify dependency. --- fail2ban.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fail2ban.spec b/fail2ban.spec index 48fa262..ab5caa4 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -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