From a032f5ee029b155cae4fe1243b77baf14ce8d516 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Oct 05 2020 22:01:07 +0000
Subject: Futher arm fixes, drop EOL conditionals


---

diff --git a/oz.spec b/oz.spec
index 2038413..a81f6f1 100644
--- a/oz.spec
+++ b/oz.spec
@@ -1,6 +1,6 @@
 Name: oz
 Version: 0.17.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Library and utilities for automated guest OS installs
 License: LGPLv2
 URL: http://github.com/clalancette/oz
@@ -10,7 +10,7 @@ Source0: https://github.com/clalancette/%{name}/archive/v%{version}/%{name}-%{ve
 Patch1: 01-clarify-bz-instance.patch
 Patch2: 02-drop-armv7-special-console-handling.patch
 Patch3: 03-add-appropriate-arch-checks.patch
-Patch4: 04-armv7-define-gicv2.patch
+#Patch4: 04-armv7-define-gicv2.patch
 Patch5: 05-arm-fix-input-devices.patch
 Patch6: 06-setup-graphical-all-except-s390x.patch
 Patch7: 07-use-2gb-ram.patch
@@ -25,11 +25,10 @@ Patch13: 13-add-f30-support.patch
 Patch14: oz-0.17.0-s390-input.patch
 Patch15: 0001-aarch64-for-linux-tty-if-acpi.patch
 Patch16: 0002-aarch64-Less-strict-CPU-checking-for-armv7-guests-on.patch
-Patch17: 0003-fedora-default-to-F30-for-versions-30.patch
+#Patch17: 0003-fedora-default-to-F30-for-versions-30.patch
 
 BuildArch: noarch
 
-%if 0%{?fedora} > 30
 BuildRequires: python3
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
@@ -40,18 +39,6 @@ Requires: python3-libvirt
 Requires: python3-m2crypto
 Requires: python3-monotonic
 Requires: python3-requests
-%else
-BuildRequires: python2
-BuildRequires: python2-devel
-BuildRequires: python3-setuptools
-Requires: m2crypto
-Requires: python2
-Requires: python2-lxml
-Requires: python2-libguestfs >= 1.18
-Requires: python2-libvirt
-Requires: python2-monotonic
-Requires: python2-requests
-%endif
 # in theory, oz doesn't really require libvirtd to be local to operate
 # properly.  However, because of the libguestfs manipulations, in practice
 # it really does.  Make it depend on libvirt (so we get libvirtd) for now,
@@ -117,6 +104,9 @@ fi
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Mon Oct 05 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-12
+- Futher arm fixes, drop EOL conditionals
+
 * Sun Oct 04 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-11
 - Add missing fixes patch