fix patch for newer Fedora releases

0003-fedora-default-to-F30-for-versions-30.patch

@@ -1,34 +1,32 @@
-From a66597b855502fd5711b507f61ef4ef1cc28000b Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 4 Oct 2020 10:53:15 +0100
-Subject: [PATCH 3/3] fedora: default to F30 for versions > 30
+From c77ee4884d4ebcb2ae3c89557071d72c138bba74 Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 11 Sep 2020 11:26:42 -0500
+Subject: [PATCH] fedora: default to F30 for versions > 30
 
 Instead of constantly updating the fedora version match logic
 we can start to use some range based selections so that it
 only needs to be updated if something changes.
 
 Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
  oz/Fedora.py | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/oz/Fedora.py b/oz/Fedora.py
-index cdee222..4fd0b1c 100644
+index f02ac8b..d4d5405 100644
 --- a/oz/Fedora.py
 +++ b/oz/Fedora.py
-@@ -249,7 +249,10 @@
+@@ -249,7 +249,10 @@ class FedoraGuest(oz.RedHat.RedHatLinuxCDYumGuest):
      def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,  # pylint: disable=unused-argument
                   brokenisomethod, output_disk=None, macaddress=None,    # pylint: disable=unused-argument
                   assumed_update=None, useuefi=False):
 -        self.config = version_to_config[tdl.update]
-+        if tdl.update < 31:
++        if int(tdl.update) < 31:
 +            self.config = version_to_config[tdl.update]
 +        else:
-+            self.config = version_to_config[30]
++            self.config = version_to_config["30"]
          if nicmodel is None:
              nicmodel = self.config.default_netdev
          if diskbus is None:
--- 
-2.26.2
-
+--
+2.30.0

oz.spec

@@ -1,6 +1,6 @@
 Name: oz
 Version: 0.17.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Library and utilities for automated guest OS installs
 License: LGPLv2
 URL: http://github.com/clalancette/oz
@@ -25,7 +25,7 @@ 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
 # https://github.com/clalancette/oz/pull/283
 Patch18: oz-guest-always-use-cpu-host-passthrough.patch
 
@@ -106,6 +106,9 @@ fi
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Tue Feb 09 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-15
+- fix patch for newer Fedora releases
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild