From nobody Sun May 19 02:38:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1515688348778180.79370513288382; Thu, 11 Jan 2018 08:32:28 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2DFC4C059721; Thu, 11 Jan 2018 16:32:16 +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 E844C67647; Thu, 11 Jan 2018 16:32:09 +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 E0A9D1800B61; Thu, 11 Jan 2018 16:31:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0BGVsPx008294 for ; Thu, 11 Jan 2018 11:31:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7205A851A; Thu, 11 Jan 2018 16:31:54 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB91B60C4B; Thu, 11 Jan 2018 16:31:47 +0000 (UTC) From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Thu, 11 Jan 2018 16:31:45 +0000 Message-Id: <20180111163145.5661-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] rpm: updates wrt min required fedora version 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 11 Jan 2018 16:32:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update the min fedora to 25. Use a macro to record the min versions so that= the later error message is always in sync with the earlier version check. Clari= fy the comment that refers to guessing of dist which does not actually happen. Signed-off-by: Daniel P. Berrange Reviewed-by: Jiri Denemark --- libvirt.spec.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7e1b6a27d3..713961573a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,10 +1,12 @@ # -*- rpm-spec -*- =20 # This spec file assumes you are building on a Fedora or RHEL version -# that's still supported by the vendor: that means Fedora 23 or newer, -# or RHEL 6 or newer. It may need some tweaks for other distros. -# If neither fedora nor rhel was defined, try to guess them from dist -%if (0%{?fedora} && 0%{?fedora} >=3D 23) || (0%{?rhel} && 0%{?rhel} >=3D 6) +# 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 6 +%define min_fedora 25 + +%if (0%{?fedora} && 0%{?fedora} >=3D %{min_fedora}) || (0%{?rhel} && 0%{?r= hel} >=3D %{min_rhel}) %define supported_platform 1 %else %define supported_platform 0 @@ -1132,7 +1134,7 @@ rm -rf .git =20 %build %if ! %{supported_platform} -echo "This RPM requires either Fedora >=3D 20 or RHEL >=3D 6" +echo "This RPM requires either Fedora >=3D %{min_fedora} or RHEL >=3D %{mi= n_rhel}" exit 1 %endif =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list