The rewritten checks, which made it possible to drop the
variable, are in fact not equivalent to the original ones,
and rewriting them once again so that they are would make
them unwieldy. Let's go back to how things were.
Reverts: 69c8d5954ec4c5be22c2ebe313dbdc6c3f98c7b5
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
libvirt.spec.in | 12 +++++++++---
mingw-libvirt.spec.in | 12 +++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9dea6c6787..013c7742a2 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -6,6 +6,12 @@
%define min_rhel 8
%define min_fedora 33
+%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel}
+ %define supported_platform 1
+%else
+ %define supported_platform 0
+%endif
+
%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
%if 0%{?rhel}
%define arches_qemu_kvm x86_64 aarch64 s390x
@@ -923,9 +929,9 @@ Libvirt plugin for NSS for translating domain names into IP addresses.
%autosetup -S git_am
%build
-%if (0%{?fedora} && 0%{?fedora} < %{min_fedora}) || (0%{?rhel} && 0%{?rhel} < %{min_rhel})
- echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
- exit 1
+%if ! %{supported_platform}
+echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
+exit 1
%endif
%if %{with_qemu}
diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in
index 61a4843fb3..84b8998f74 100644
--- a/mingw-libvirt.spec.in
+++ b/mingw-libvirt.spec.in
@@ -5,6 +5,12 @@
# or versions, but no effort will be made to ensure that going forward.
%define min_fedora 33
+%if 0%{?fedora} && 0%{?fedora} >= %{min_fedora}
+ %define supported_platform 1
+%else
+ %define supported_platform 0
+%endif
+
Name: mingw-libvirt
Version: @VERSION@
Release: 1%{?dist}
@@ -89,9 +95,9 @@ MinGW Windows libvirt virtualization library.
%setup -q -n libvirt-%{version}
%build
-%if 0%{?fedora} < %{min_fedora}
- echo "This RPM requires Fedora >= %{min_fedora}"
- exit 1
+%if ! %{supported_platform}
+echo "This RPM requires Fedora >= %{min_fedora}"
+exit 1
%endif
%mingw_meson \
--
2.26.3
