From 1e5fef520eacf80463ffaf1feefa4ad70d7f6d5a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 9 Mar 2016 12:02:13 -0700
Subject: [PATCH] Revert "Use python3 (bug #1282498)"

This reverts commit 3454a2012a174aea6aa8ef1a64b9773f86ff0334.

Conflicts:
	fail2ban.spec
---
 fail2ban.spec | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/fail2ban.spec b/fail2ban.spec
index d7024c0..ab85ba6 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -13,11 +13,9 @@ Patch0: fail2ban-test.patch
 # https://github.com/fail2ban/fail2ban/issues/1354
 Patch1: fail2ban-mysql.patch
 
-BuildRequires: python3-devel
-# For 2to3
-BuildRequires: python2-tools
+BuildRequires: python-devel
 # For testcases
-BuildRequires: python3-inotify
+BuildRequires: python-inotify
 BuildArch: noarch
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: systemd
@@ -48,7 +46,7 @@ configurations.
 %package server
 Summary: Core server component for Fail2Ban
 %if 0%{?fedora} || 0%{?rhel} >= 7
-Requires: python3-systemd
+Requires: systemd-python
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -75,12 +73,10 @@ Requires: %{name}-mail = %{version}-%{release}
 Requires: %{name}-sendmail = %{version}-%{release}
 Requires: %{name}-server = %{version}-%{release}
 Requires: %{name}-shorewall = %{version}-%{release}
-# Currently this breaks jails that don't log to the journal
 #Requires: %{name}-systemd = %{version}-%{release}
-# No python3 support for gamin
-#Requires: gamin-python
+Requires: gamin-python
 Requires: perl
-Requires: python3-inotify
+Requires: python-inotify
 Requires: /usr/bin/whois
 
 %description all
@@ -154,13 +150,12 @@ by default.
 sed -i -e 's/^before = paths-.*/before = paths-fedora.conf/' config/jail.conf
 # Start after firewalld (https://bugzilla.redhat.com/show_bug.cgi?id=1067147)
 sed -i -e '/^After=/s/$/ firewalld.service/' files/fail2ban.service
-2to3 --write --nobackups .
 
 %build
-%py3_build
+%py_build
 
 %install
-%py3_install
+%py_install
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 mkdir -p %{buildroot}%{_unitdir}
@@ -205,7 +200,7 @@ rm -r %{buildroot}%{_docdir}/%{name}
 %check
 # Need a UTF-8 locale to work
 export LANG=en_US.UTF-8
-./fail2ban-testcases-all-python3 --no-network
+./fail2ban-testcases-all --no-network
 
 %post server
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -237,7 +232,7 @@ fi
 %{_bindir}/fail2ban-client
 %{_bindir}/fail2ban-regex
 %{_bindir}/fail2ban-testcases
-%{python3_sitelib}/*
+%{python_sitelib}/*
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/fail2ban.service
 %else
@@ -284,9 +279,6 @@ fi
 - Update to 0.9.4
 - Use mariadb log path by default
 
-* Tue Feb 23 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-3
-- Use python3 (bug #1282498)
-
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild