From nobody Wed May 14 20:01:52 2025 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1518617834497714.5978646988578; Wed, 14 Feb 2018 06:17:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D935E3B720; Wed, 14 Feb 2018 14:17:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24CA25D965; Wed, 14 Feb 2018 14:17:12 +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 5E31B4A46D; Wed, 14 Feb 2018 14:17:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1EEBi1R006810 for ; Wed, 14 Feb 2018 09:11:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id EBB8E200BAAD; Wed, 14 Feb 2018 14:11:43 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB0442156619 for ; Wed, 14 Feb 2018 14:11:43 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id D90401012F0; Wed, 14 Feb 2018 15:11:42 +0100 (CET) From: Jiri Denemark To: libvir-list@redhat.com Date: Wed, 14 Feb 2018 15:11:38 +0100 Message-Id: <2bedcd7a81fbc790189d558aecbc25b4c331d98f.1518616951.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/6] spec: Drop checks for old Fedora releases 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 14 Feb 2018 14:17:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The oldest Fedora release supported by the spec file is 26. Checking for anything older makes no sense. Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5d05acd620..daf7098216 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -73,7 +73,7 @@ %define with_numactl 0%{!?_without_numactl:1} =20 # F25+ has zfs-fuse -%if 0%{?fedora} >=3D 25 +%if 0%{?fedora} %define with_storage_zfs 0%{!?_without_storage_zfs:1} %else %define with_storage_zfs 0 @@ -233,14 +233,10 @@ %define enable_werror --disable-werror %endif =20 -%if 0%{?fedora} >=3D 25 +%if 0%{?fedora} %define tls_priority "@LIBVIRT,SYSTEM" %else - %if 0%{?fedora} - %define tls_priority "@SYSTEM" - %else - %define tls_priority "NORMAL" - %endif + %define tls_priority "NORMAL" %endif =20 =20 @@ -451,11 +447,7 @@ BuildRequires: numad %endif =20 %if %{with_wireshark} - %if 0%{fedora} >=3D 24 BuildRequires: wireshark-devel >=3D 2.1.0 - %else -BuildRequires: wireshark-devel >=3D 1.12.1 - %endif %endif =20 %if %{with_libssh} @@ -794,7 +786,7 @@ Requires: gzip Requires: bzip2 Requires: lzop Requires: xz - %if 0%{?fedora} >=3D 24 + %if 0%{?fedora} Requires: systemd-container %endif =20 @@ -812,7 +804,7 @@ Group: Development/Libraries Requires: libvirt-daemon =3D %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network =3D %{version}-%{release} - %if 0%{?fedora} >=3D 24 + %if 0%{?fedora} Requires: systemd-container %endif =20 @@ -1421,13 +1413,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-d= river/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a %if %{with_wireshark} - %if 0%{fedora} >=3D 24 rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la - %else -rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la -mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \ - $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so - %endif %endif =20 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list