spec: Reintroduce supported_platform variable

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: 69c8d5954e
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Andrea Bolognani 2021-05-11 17:13:59 +02:00
parent 3976dc598a
commit 62e5dc56d9
2 changed files with 18 additions and 6 deletions

View File

@ -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}

View File

@ -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 \