From nobody Fri May 17 14:19:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620245536; cv=none; d=zohomail.com; s=zohoarc; b=Cyb9F/Xn2iVZEOEpfMDcF8+B+HorOm67GWeRXabDtoSkzanuWHrX/sP780KEauT6dEma/wTihr9xmzEmDviDZejNWJ/S5ZerchCCihUmD45/nkzOsIR0qnXgybScxXyS0EjZqUEuGHB/zDkVW4glREEkcZ2kDw3OSuTHiCdfZUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620245536; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mhbx3GvUxDcfurTlvY2w1BT2zOOWUFo/PuJJah8e0AU=; b=PhEU+mvHZ8/VDDVGA631bHJno7OdDlIixeVoy58mU+HaqsFd7zS/7bcNuZsXirWgUwYQtWRFmPbtNo0xBsc2Gi4JvxFDsF4aKvrmu8PG1HibBN0fPXTMGCOGCarHRmgV1luVDDPmoerd6mGNq2PqnAsBdAJLX1n0CbVhf5yX7Jw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1620245536749760.6502450105588; Wed, 5 May 2021 13:12:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-197-6fA86AdnPQWbKmN7eExHZQ-1; Wed, 05 May 2021 16:12:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83C8984A5E5; Wed, 5 May 2021 20:12:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B5B45C5B5; Wed, 5 May 2021 20:12:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 93BDD18005B6; Wed, 5 May 2021 20:12:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 145KC0Se023579 for ; Wed, 5 May 2021 16:12:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1DBE5D9E2; Wed, 5 May 2021 20:12:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.196.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18A3C5D9DD for ; Wed, 5 May 2021 20:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620245535; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Mhbx3GvUxDcfurTlvY2w1BT2zOOWUFo/PuJJah8e0AU=; b=LQwtGxSrgqKsaxpI8aFLxA0mapeX+/grv5pCKerFMVJxC0scIdfPNPSVMokVVNLHIEIKkB VrEaKR9dTw6s7jWce44fMkjfnDOY4aO5mrHJbp922jS+IoKhhwMqGrNeWrLrX3V9EkOs3G YI5yIRSSlRxjrGtAkstLwR0eMc6p5n8= X-MC-Unique: 6fA86AdnPQWbKmN7eExHZQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] spec: Don't disable LTO in Fedora 34 Date: Wed, 5 May 2021 22:11:50 +0200 Message-Id: <20210505201152.71739-2-abologna@redhat.com> In-Reply-To: <20210505201152.71739-1-abologna@redhat.com> References: <20210505201152.71739-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The bug that caused this to be added https://bugzilla.redhat.com/show_bug.cgi?id=3D1889763 has since been resolved. Reverts: a16c0402bae3138c8c6c6da5bbe1bb4ad2c4dc06 Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index da7af2824e..27de42f822 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -985,13 +985,6 @@ Libvirt plugin for NSS for translating domain names in= to IP addresses. %autosetup -S git_am =20 %build - -%if 0%{?fedora} =3D=3D 34 - # binutils change in F34 broke linking of tests - # https://bugzilla.redhat.com/show_bug.cgi?id=3D1889763 - %define _lto_cflags %{nil} -%endif - %if ! %{supported_platform} echo "This RPM requires either Fedora >=3D %{min_fedora} or RHEL >=3D %{mi= n_rhel}" exit 1 --=20 2.26.3 From nobody Fri May 17 14:19:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620245535; cv=none; d=zohomail.com; s=zohoarc; b=BEYAikzmO1rE73GXQF5b73IjbN8GkmkYg5SL8AWpHrSm2SCIXLe1HFjEuPzuuzniqZS/4vKCOlNgn9I2Rcsou+dLAlPJCMvZq5IYZSIM5pQKlKZPNENoN5h/slRQNtdQPmOADKJpxkst9Z6kbcqkLedC2P5U3H1n3xEsMTrxmz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620245535; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ctVjJ1OaziZ5Q/q1p/e41ZWnhtf74Br80EOGdb7jsj0=; b=j9yMhH3UoSWRQf/sDFI1MS/FC4bOHCf2kBcxaZx3swsdXsT1ZaubcbvZ74MdJ+tn39u+NzSR+VvktEyDWbPciB/aBVCXR6HAekYEW4dWfw7ACho2oP7lYq0HEi0g5F8yRiqzZ8PpaJ+LSIbzNV2S1h1QO994sz+fdVmJU5vSHsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620245535322509.01881271433274; Wed, 5 May 2021 13:12:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20--4El93ecPzWuFemSDh-sMw-1; Wed, 05 May 2021 16:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4764284A5E1; Wed, 5 May 2021 20:12:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ACBDF5D703; Wed, 5 May 2021 20:12:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1A8ED1806D0E; Wed, 5 May 2021 20:12:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 145KC2Xe023585 for ; Wed, 5 May 2021 16:12:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 900125D9DE; Wed, 5 May 2021 20:12:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.196.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AC595D9DD for ; Wed, 5 May 2021 20:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620245534; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ctVjJ1OaziZ5Q/q1p/e41ZWnhtf74Br80EOGdb7jsj0=; b=P6oOROuE3xp05TwwdQzCL6tDlmFyAcnMsJ4W7722PfFcVsUqOkFVe1wHsrEh8A5dOfohIM TxJ7+HMCFP4yNIER48+AIqZDRjO8NDbjI6Ian4j3zLpNY3bSaS2n2GdmD4dMVktjCLr1+k gtTNlrsvZlDYCcVjy4Frt8gTwzpSLGE= X-MC-Unique: -4El93ecPzWuFemSDh-sMw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] spec: Bump min_fedora and min_rhel Date: Wed, 5 May 2021 22:11:51 +0200 Message-Id: <20210505201152.71739-3-abologna@redhat.com> In-Reply-To: <20210505201152.71739-1-abologna@redhat.com> References: <20210505201152.71739-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" According to our platform support policy https://libvirt.org/platforms.html RHEL 7 and all versions of Fedora older than 33 are going to be out of scope by the time libvirt 7.4.0 is released. Dropping RHEL 7 in particular allows us to greatly simplify many parts of the spec file. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 102 ++++++++---------------------------------- mingw-libvirt.spec.in | 2 +- 2 files changed, 19 insertions(+), 85 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 27de42f822..013c7742a2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -3,8 +3,8 @@ # This spec file assumes you are building on a Fedora or RHEL version # 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 7 -%define min_fedora 31 +%define min_rhel 8 +%define min_fedora 33 =20 %if 0%{?fedora} >=3D %{min_fedora} || 0%{?rhel} >=3D %{min_rhel} %define supported_platform 1 @@ -12,18 +12,9 @@ %define supported_platform 0 %endif =20 -# On RHEL 7 and older macro _vpath_builddir is not defined. -%if 0%{?rhel} && 0%{?rhel} <=3D 7 - %define _vpath_builddir %{_target_platform} -%endif - %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x %if 0%{?rhel} - %if 0%{?rhel} <=3D 8 - %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x - %else - %define arches_qemu_kvm x86_64 aarch64 s390x - %endif + %define arches_qemu_kvm x86_64 aarch64 s390x %endif =20 %define arches_64bit x86_64 %{power64} aarch64 s390x riscv64 @@ -77,25 +68,20 @@ =20 %define with_storage_gluster 0%{!?_without_storage_gluster:1} %ifnarch %{arches_qemu_kvm} - # gluster is only built where qemu driver is enabled on RHEL 8 - %if 0%{?rhel} >=3D 8 + # gluster is only built where qemu driver is enabled on RHEL + %if 0%{?rhel} %define with_storage_gluster 0 %endif %endif =20 -# F25+ has zfs-fuse +# Fedora has zfs-fuse %if 0%{?fedora} %define with_storage_zfs 0%{!?_without_storage_zfs:1} %else %define with_storage_zfs 0 %endif =20 -# We need a recent enough libiscsi (>=3D 1.18.0) -%if 0%{?fedora} || 0%{?rhel} > 7 - %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} -%else - %define with_storage_iscsi_direct 0 -%endif +%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} =20 # Other optional features %define with_numactl 0%{!?_without_numactl:1} @@ -130,9 +116,7 @@ %define with_storage_rbd 0 %endif =20 -# RHEL doesn't ship OpenVZ, VBox, PowerHypervisor, -# VMware, libxenlight (Xen 4.1 and newer), -# or HyperV. +# RHEL doesn't ship many hypervisor drivers %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 @@ -140,15 +124,10 @@ %define with_libxl 0 %define with_hyperv 0 %define with_vz 0 - - %if 0%{?rhel} > 7 - %define with_lxc 0 - %endif + %define with_lxc 0 %endif =20 -%if 0%{?fedora} || 0%{?rhel} > 7 - %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} -%endif +%define with_firewalld_zone 0%{!?_without_firewalld_zone:1} =20 %if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9) %define with_netcf 0%{!?_without_netcf:1} @@ -176,16 +155,12 @@ %define with_libssh2 0%{!?_without_libssh2:1} %endif =20 -# Enable wireshark plugins for all distros except RHEL-7 -%if 0%{?fedora} || 0%{?rhel} > 7 - %define with_wireshark 0%{!?_without_wireshark:1} - %define wireshark_plugindir %(pkg-config --variable plugindir wireshar= k)/epan -%endif +# Enable wireshark plugins for all distros +%define with_wireshark 0%{!?_without_wireshark:1} +%define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/e= pan =20 -# Enable libssh transport for new enough distros -%if 0%{?fedora} || 0%{?rhel} > 7 - %define with_libssh 0%{!?_without_libssh:1} -%endif +# Enable libssh transport for all distros +%define with_libssh 0%{!?_without_libssh:1} =20 %if %{with_qemu} || %{with_lxc} # numad is used to manage the CPU and memory placement dynamically, @@ -213,11 +188,7 @@ %define enable_werror -Dwerror=3Dfalse %endif =20 -%if 0%{?rhel} =3D=3D 7 - %define tls_priority "NORMAL" -%else - %define tls_priority "@LIBVIRT,SYSTEM" -%endif +%define tls_priority "@LIBVIRT,SYSTEM" =20 =20 Summary: Library providing a simple virtualization API @@ -262,20 +233,12 @@ Requires: libvirt-libs =3D %{version}-%{release} =20 # All build-time requirements. Run-time requirements are # listed against each sub-RPM -%if 0%{?rhel} =3D=3D 7 -BuildRequires: python36-docutils -%else BuildRequires: python3-docutils -%endif BuildRequires: gcc BuildRequires: meson >=3D 0.54.0 BuildRequires: ninja-build BuildRequires: git -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter -%else -BuildRequires: perl -%endif BuildRequires: python3 BuildRequires: systemd-units %if %{with_libxl} @@ -333,13 +296,8 @@ BuildRequires: device-mapper-devel # For XFS reflink clone support BuildRequires: xfsprogs-devel %if %{with_storage_rbd} - %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: librados-devel BuildRequires: librbd-devel - %else -BuildRequires: librados2-devel -BuildRequires: librbd1-devel - %endif %endif %if %{with_storage_gluster} BuildRequires: glusterfs-api-devel >=3D 3.4.1 @@ -401,11 +359,7 @@ BuildRequires: wireshark-devel BuildRequires: libssh-devel >=3D 0.7.0 %endif =20 -# On RHEL-7 rpcgen is still part of glibc-common package -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: rpcgen -%endif - BuildRequires: libtirpc-devel =20 # Needed for the firewalld_reload macro @@ -440,12 +394,10 @@ Requires: /usr/bin/nc # for modprobe of pci devices Requires: module-init-tools =20 -# for /sbin/ip & /sbin/tc +# for /sbin/ip Requires: iproute -# tc is provided by iproute-tc since at least Fedora 26 -%if 0%{?fedora} || 0%{?rhel} > 7 +# for /sbin/tc Requires: iproute-tc -%endif =20 Requires: polkit >=3D 0.112 %if %{with_dmidecode} @@ -529,9 +481,7 @@ Requires: libvirt-libs =3D %{version}-%{release} # needed for device enumeration Requires: systemd >=3D 185 # For managing persistent mediated devices -%if 0%{?fedora} || 0%{?rhel} > 7 Requires: mdevctl -%endif =20 %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -747,12 +697,8 @@ Requires: gzip Requires: bzip2 Requires: lzop Requires: xz - %if 0%{?fedora} || 0%{?rhel} > 7 Requires: systemd-container - %endif - %if 0%{?fedora} || 0%{?rhel} > 7 Requires: swtpm-tools - %endif =20 %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing @@ -768,9 +714,7 @@ Requires: libvirt-daemon =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network =3D %{version}-%{release} - %if 0%{?fedora} || 0%{?rhel} > 7 Requires: systemd-container - %endif =20 %description daemon-driver-lxc The LXC driver plugin for the libvirtd daemon, providing @@ -1292,16 +1236,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvi= rt_qemu_probes.stp \ # raising the test timeout VIR_TEST_DEBUG=3D1 %meson_test --no-suite syntax-check --timeout-multiplie= r 10 =20 -%post libs -%if 0%{?rhel} =3D=3D 7 -/sbin/ldconfig -%endif - -%postun libs -%if 0%{?rhel} =3D=3D 7 -/sbin/ldconfig -%endif - %pre daemon # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 288f533d52..84b8998f74 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -3,7 +3,7 @@ # This spec file assumes you are building on a Fedora version # 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_fedora 31 +%define min_fedora 33 =20 %if 0%{?fedora} && 0%{?fedora} >=3D %{min_fedora} %define supported_platform 1 --=20 2.26.3 From nobody Fri May 17 14:19:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620245548; cv=none; d=zohomail.com; s=zohoarc; b=kctlNV/9UuoBpBA3vSwS7wmAHTLfxkB+o1SfWtASd6ix4eV2OZSBA5NeGLD1AphBI9Bqr/ZK75+xIueupK2AW4/KsMBNZWyOb4A5JiZN3VE15yKyHIH8RsbuFu1XVXoLjpCIY9nl3Aj+h33zVbsIy/82P1OBWhfpLegVw9dPM0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620245548; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=feDc2B+sWaZAMRLiUjg26W/eNedMqNRxRR4GGaNbzCI=; b=Ni/qUpkwkn4KKn/N1vepYjt9kaGz3Q3owjduzI/7hgpT5cQveU6Ol6ks0fsOEiHyPP6afvaU+GL87r2lrihUC0IazzBJbOv91ykIzeuATKq0g0oUkRoegkJ36Kn3uPis5FwA7ArgUM540GA6XOPIR42FFUFmOSIS1BJrexMvlw8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 162024554834611.66140431732697; Wed, 5 May 2021 13:12:28 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-lo4kin_gPnmi3Mutk0XA5w-1; Wed, 05 May 2021 16:12:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0816D6D24F; Wed, 5 May 2021 20:12:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D08F25C1A3; Wed, 5 May 2021 20:12:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9CD161800BC1; Wed, 5 May 2021 20:12:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 145KC4ag023600 for ; Wed, 5 May 2021 16:12:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 247C35D9DE; Wed, 5 May 2021 20:12:04 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.196.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C4A75D9DD for ; Wed, 5 May 2021 20:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620245547; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=feDc2B+sWaZAMRLiUjg26W/eNedMqNRxRR4GGaNbzCI=; b=J4tFqL7RGxSeDq4MEV7XJ0IDeurNPsH9P0Re6528D251htf58cK6qeHH4Dn7NEuve7b4Mw azYhWnKGB+YgMewnhx8Ho+P9I0gbpn02x6U+p45xEjaskSgEzDV3WzA42wehB+yoP+hbO9 BB8j15DhHkLH6zvnKC+I6ClLe9mb7qY= X-MC-Unique: lo4kin_gPnmi3Mutk0XA5w-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] spec: Drop supported_platform variable Date: Wed, 5 May 2021 22:11:52 +0200 Message-Id: <20210505201152.71739-4-abologna@redhat.com> In-Reply-To: <20210505201152.71739-1-abologna@redhat.com> References: <20210505201152.71739-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It's only used in one place, and it's nicer to keep the error message close to the check that causes it to be emitted. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 12 +++--------- mingw-libvirt.spec.in | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 013c7742a2..9dea6c6787 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -6,12 +6,6 @@ %define min_rhel 8 %define min_fedora 33 =20 -%if 0%{?fedora} >=3D %{min_fedora} || 0%{?rhel} >=3D %{min_rhel} - %define supported_platform 1 -%else - %define supported_platform 0 -%endif - %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s= 390x %if 0%{?rhel} %define arches_qemu_kvm x86_64 aarch64 s390x @@ -929,9 +923,9 @@ Libvirt plugin for NSS for translating domain names int= o IP addresses. %autosetup -S git_am =20 %build -%if ! %{supported_platform} -echo "This RPM requires either Fedora >=3D %{min_fedora} or RHEL >=3D %{mi= n_rhel}" -exit 1 +%if (0%{?fedora} && 0%{?fedora} < %{min_fedora}) || (0%{?rhel} && 0%{?rhel= } < %{min_rhel}) + echo "This RPM requires either Fedora >=3D %{min_fedora} or RHEL >=3D = %{min_rhel}" + exit 1 %endif =20 %if %{with_qemu} diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 84b8998f74..61a4843fb3 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -5,12 +5,6 @@ # or versions, but no effort will be made to ensure that going forward. %define min_fedora 33 =20 -%if 0%{?fedora} && 0%{?fedora} >=3D %{min_fedora} - %define supported_platform 1 -%else - %define supported_platform 0 -%endif - Name: mingw-libvirt Version: @VERSION@ Release: 1%{?dist} @@ -95,9 +89,9 @@ MinGW Windows libvirt virtualization library. %setup -q -n libvirt-%{version} =20 %build -%if ! %{supported_platform} -echo "This RPM requires Fedora >=3D %{min_fedora}" -exit 1 +%if 0%{?fedora} < %{min_fedora} + echo "This RPM requires Fedora >=3D %{min_fedora}" + exit 1 %endif =20 %mingw_meson \ --=20 2.26.3