From bdb10f9de8f5dc7208bc6c026afc5a6581fc2e99 Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 3 Jul 2023 18:25:49 +0200
Subject: [PATCH] rpm: Bump min_fedora

According to our platform support policy, now that Fedora 38 is
out we no longer target Fedora 36 and older. This allows us to
simplify a few conditionals.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---
 libvirt.spec.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1f77cd90b7..c72b420e85 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -4,7 +4,7 @@
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward.
 %define min_rhel 8
-%define min_fedora 33
+%define min_fedora 37
 
 %define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
 %if 0%{?rhel}
@@ -21,7 +21,7 @@
 %define arches_systemtap_64bit  %{arches_64bit}
 %define arches_dmidecode        %{arches_x86}
 %define arches_xen              %{arches_x86} aarch64
-%if 0%{?fedora} >= 36
+%if 0%{?fedora}
     %define arches_xen              x86_64 aarch64
 %endif
 %define arches_vbox             %{arches_x86}
@@ -134,7 +134,7 @@
 
 %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 
-%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)
+%if 0%{?rhel} && 0%{?rhel} < 9
     %define with_netcf 0%{!?_without_netcf:1}
 %endif
 
@@ -179,7 +179,7 @@
 %endif
 
 %define with_modular_daemons 0
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?rhel} >= 9
     %define with_modular_daemons 1
 %endif
 
@@ -347,7 +347,7 @@ BuildRequires: libssh2-devel >= 1.3.0
 %if %{with_netcf}
 BuildRequires: netcf-devel >= 0.2.2
 %endif
-%if (0%{?fedora} >= 36) || (0%{?rhel} >= 9)
+%if 0%{?fedora} || 0%{?rhel} >= 9
 BuildRequires: passt
 %endif
 %if %{with_esx}
@@ -467,7 +467,7 @@ Requires: dbus
 # For uid creation during pre
 Requires(pre): shadow-utils
 # Needed by /usr/libexec/libvirt-guests.sh script.
-%if 0%{?fedora} >= 37
+%if 0%{?fedora}
 Requires: gettext-runtime
 %else
 Requires: gettext
@@ -763,7 +763,7 @@ Requires: swtpm-tools
     %if %{with_numad}
 Requires: numad
     %endif
-    %if (0%{?fedora} >= 36) || (0%{?rhel} >= 9)
+    %if 0%{?fedora} || 0%{?rhel} >= 9
 Recommends: passt
 Recommends: passt-selinux
     %endif