From nobody Fri May 3 20:37:24 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=1605287019; cv=none; d=zohomail.com; s=zohoarc; b=RQ3xoMe3tOZE3PIP+hkNLllPtfUEwoYuHJVIpfIXPCDhBgzC0owkfcbwvO2tapjN+2MBMUApaB4F6nyZw0/UqtrAmWAZMU2+IjoLzFRkSYRD+Bnw8XWzb1UW9VcGqTlWwUlKAHGq0HVQDs+7E4SW1QBqlUUbaTbOwPfYPkxXq8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287019; 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=djTG+HmTf1IRwDd0ippns/HxDkyBOpz1HmF832o2Bys=; b=gZB9ahZ27jJfHrJzg40LWEAfL1dgAtiKHZHZL2iysVQGvgtGdjKnxTwFzvog2GMmGcYXt1wTcaFyzW77F+Gsd4ANB1r2TYREgDuQsfMfr5xd3BxEZtt+hCiprZsTmlDFmHZq5Wl2hNJUPFACJsffnwOCSgFq8xfgrRHCABsDl+w= 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 1605287019393814.2743902845912; Fri, 13 Nov 2020 09:03:39 -0800 (PST) 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-537-LnmM0Qn7NIaQORwi1IsCEg-1; Fri, 13 Nov 2020 12:03:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9978C804753; Fri, 13 Nov 2020 17:03:27 +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 4170D60C11; Fri, 13 Nov 2020 17:03:27 +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 E85D8181A870; Fri, 13 Nov 2020 17:03:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3OTB030801 for ; Fri, 13 Nov 2020 12:03:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7FADA5C5BB; Fri, 13 Nov 2020 17:03:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE2B15C629; Fri, 13 Nov 2020 17:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287018; 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=djTG+HmTf1IRwDd0ippns/HxDkyBOpz1HmF832o2Bys=; b=btIzI4G/AUboZjYaRAdpDoTsBVGKbqavTHtv5QIQQL4GbYLvL/JDhnXwwMGfrdaet9lECQ hLggQ33QYFwEfIHxYA4oWBiHCnFX6PSJi2PkGI5YWVhgy95lOQhbm9PVnonH16MzChTOMX YYz8L24GP53kp/NiGyse0rksl4X+02g= X-MC-Unique: LnmM0Qn7NIaQORwi1IsCEg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] meson: assume pkg-config support for yajl Date: Fri, 13 Nov 2020 17:03:15 +0000 Message-Id: <20201113170318.100088-2-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Per the platform support rules, we no longer need to consider SLES 12 as a target, and so can now assume pkg-config support in yajl. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- meson.build | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d..816cf97a19 100644 --- a/meson.build +++ b/meson.build @@ -1460,25 +1460,7 @@ else endif =20 yajl_version =3D '2.0.3' -if not get_option('yajl').disabled() - yajl_dep =3D dependency('yajl', version: '>=3D' + yajl_version, required= : false) - # 2.0.3 was the version where the pkg-config file was first added - # SLES 12 and openSUSE Leap 42.3 still use 2.0.1 - # TODO: delete this in July 2020 - if not yajl_dep.found() - yajl_dep =3D cc.find_library('yajl', required: get_option('yajl')) - if yajl_dep.found() - has_func =3D cc.has_function('yajl_tree_parse', dependencies: yajl_d= ep, prefix: '#include ') - if not has_func and get_option('yajl').enabled() - error('yajl >=3D @0@ was not found'.format(yajl_version)) - elif not has_func - yajl_dep =3D dependency('', required: false) - endif - endif - endif -else - yajl_dep =3D dependency('', required: false) -endif +yajl_dep =3D dependency('yajl', version: '>=3D' + yajl_version, required: = get_option('yajl')) if yajl_dep.found() conf.set('WITH_YAJL', 1) endif --=20 2.28.0 From nobody Fri May 3 20:37:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605287029; cv=none; d=zohomail.com; s=zohoarc; b=SpJqGCkd1OF2I6j69riBhS5QGXLEThws3wgryCijYzvLVY837KENVGZAW6gqxdqz0c+6/c9qSaVMGBC3B2eBQjSAyCv7ldtKCLz8pFmrLSVYMp1MWalOw3vWcWJNvuy1xbTZIZ1dKU+JOGccmH0AvbnNN+Pt/JZhrnk1ls4kXiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287029; 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=6DVAxu2lm6W8oJiv3diTRNcAMlCEuzp536M+C2m1THU=; b=U/H5/jLMvAgW6uHMvFJ8x4mRFW0DUgUrax/dFFexg0QJCCfA2PSvPStV0Bq7pxNjajt46QZppn+xWd4B93dnufabyCPn1y+A769Zj8z8U4s5EZd7uGtZEcaZlhotdTqqFgjD9vLbbc/mFzHLLpqgyasejtGM7vXow0NzXbQdCE8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605287029836434.22086988308206; Fri, 13 Nov 2020 09:03:49 -0800 (PST) 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-540-PVcP1-yGNH24yC1mPDjsfw-1; Fri, 13 Nov 2020 12:03:44 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8FD88030D9; Fri, 13 Nov 2020 17:03:38 +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 B42FF1002D46; Fri, 13 Nov 2020 17:03:38 +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 7AEF058104; Fri, 13 Nov 2020 17:03:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3SSj030815 for ; Fri, 13 Nov 2020 12:03:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6BE5D5C629; Fri, 13 Nov 2020 17:03:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id B38B65C26A; Fri, 13 Nov 2020 17:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287028; 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=6DVAxu2lm6W8oJiv3diTRNcAMlCEuzp536M+C2m1THU=; b=CDwmbPMpfEShP83ODGmSh5mH9woF8pPptyPfxM/vkjdtravHueJD2pUyA7xjfczC7LNXXA bCCVO7IOS1YlUVdqBaUid4CQhnn0hxAPyGzoFse4up4KGoYBxFdXca4tpwn8+uvdgjE2Tm Fc4pjV5CIa12wRigHlo0i83dmZ5RgFw= X-MC-Unique: PVcP1-yGNH24yC1mPDjsfw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] meson: bump min wireshark to 2.6.0 Date: Fri, 13 Nov 2020 17:03:16 +0000 Message-Id: <20201113170318.100088-3-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) If using the declared min version of wireshark, 2.4.0, libvirt plugin fails to build. This min version isn't present in any supported distros and thus not tested by CI. We don't support wireshark on RHEL-7 since it has 1.x.x series. The next oldest version present in supported distros is 2.6.2 on RHEL-8. Thus we should bump the min version to 2.6.0. This also lets us assume that the "plugindir" variable exists in pkg-config. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- meson.build | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 816cf97a19..565a5f12e2 100644 --- a/meson.build +++ b/meson.build @@ -1403,7 +1403,7 @@ else win32_link_flags =3D [] endif =20 -wireshark_version =3D '2.4.0' +wireshark_version =3D '2.6.0' wireshark_dep =3D dependency('wireshark', version: '>=3D' + wireshark_vers= ion, required: get_option('wireshark_dissector')) if wireshark_dep.found() wireshark_plugindir =3D get_option('wireshark_plugindir') @@ -1411,31 +1411,22 @@ if wireshark_dep.found() wireshark_plugindir =3D wireshark_dep.get_pkgconfig_variable('plugindi= r') endif =20 - # On some systems the plugindir variable may not be stored within pkg co= nfig. - # Fall back to older style of constructing the plugin dir path. - if wireshark_plugindir =3D=3D '' - wireshark_modversion =3D wireshark_dep.version() - wireshark_plugindir =3D '@0@/wireshark/plugins/@1@'.format( - libdir, wireshark_modversion - ) - else - wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') - if wireshark_prefix =3D=3D '' - # If wireshark's prefix cannot be retrieved from pkg-config, - # this is our best bet. - wireshark_prefix =3D '/usr' - endif - # Replace wireshark's prefix with our own. - # There is no replace method in meson so we have to workaround it. - rc =3D run_command( - 'python3', '-c', - 'print("@0@".replace("@1@", "@2@"))'.format( - wireshark_plugindir, wireshark_prefix, prefix, - ), - check: true, - ) - wireshark_plugindir =3D rc.stdout().strip() - endif + wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') + if wireshark_prefix =3D=3D '' + # If wireshark's prefix cannot be retrieved from pkg-config, + # this is our best bet. + wireshark_prefix =3D '/usr' + endif + # Replace wireshark's prefix with our own. + # There is no replace method in meson so we have to workaround it. + rc =3D run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + wireshark_plugindir, wireshark_prefix, prefix, + ), + check: true, + ) + wireshark_plugindir =3D rc.stdout().strip() =20 # Since wireshark 2.5.0 plugins can't live in top level plugindir but ha= ve # to be under one of ["epan", "wiretap", "codecs"] subdir. The first one= looks okay. --=20 2.28.0 From nobody Fri May 3 20:37:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605287337; cv=none; d=zohomail.com; s=zohoarc; b=Eb0BpW2gOybgdN3gUW4e7QYg6XVcaQWMarNdGKwMGn/Ubfc5jw5bL3j0IFjQpuWWEy+hhlKMS+IjOuG/idGe09Kx34xrNUA//hweOFLKBNtbKj9QRUMwsCA3Vv8jja/RY+JG//eiXzpE0AbknORq1H2UT2gv0LWkFKqgcx2HsG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287337; 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=CyuwH63MOQmMVzxuCNOUrTFJuCKVgXiZWXSo0a7Y00I=; b=krgqrNhhEGvdg+WwZXqMZ7KRQnkAj1HO4XJBep0gbAxz/4QT4K1cjLl6izkD7MKXKRjP+txa50VQ22BSIvsTqOjJChu/YS9tMRjhwOXasSQzYo3Z5M92m4tIBfEuJwCawbgzJPO5HZtg60lWIgDqP2VB0JtOi6ao5nDFbS+a7FE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605287337434526.2772789411608; Fri, 13 Nov 2020 09:08:57 -0800 (PST) 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-210-tpVwsXtKP8mUDSCSlUBMFw-1; Fri, 13 Nov 2020 12:08:51 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E7CE6D25F; Fri, 13 Nov 2020 17:08:46 +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 EAAA76EF41; Fri, 13 Nov 2020 17:08:45 +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 C8BA1181A86E; Fri, 13 Nov 2020 17:08:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3TKR030821 for ; Fri, 13 Nov 2020 12:03:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id A891E5C26A; Fri, 13 Nov 2020 17:03:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id C269B5C1C7; Fri, 13 Nov 2020 17:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287334; 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=CyuwH63MOQmMVzxuCNOUrTFJuCKVgXiZWXSo0a7Y00I=; b=A5Vid7XeCGECaaB15b7kozNgksZmCu/S3fPUihZYiFJHFCmkzji+fZp0SAzx2muy0u6MVK mx7IB/RyZ/ApH0q6OoO0d6pp9d18ZNNN09HbAFOr9xil3t4RSN6d3+B9VibzdOy1gnnTe5 kkf7p3aDglA9KjXV1dWRT0m2T3luiPY= X-MC-Unique: tpVwsXtKP8mUDSCSlUBMFw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] rpm: remove version checks for wireshark Date: Fri, 13 Nov 2020 17:03:17 +0000 Message-Id: <20201113170318.100088-4-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We only turn on with_wireshark if we already know the distro is guaranteed to have new enough packages. The versioned dep is thus not required. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 034982809d..43955b0e09 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -386,7 +386,7 @@ BuildRequires: numad %endif =20 %if %{with_wireshark} -BuildRequires: wireshark-devel >=3D 2.4.0 +BuildRequires: wireshark-devel %endif =20 %if %{with_libssh} @@ -928,7 +928,7 @@ Bash completion script stub. %if %{with_wireshark} %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions -Requires: wireshark >=3D 2.4.0 +Requires: wireshark Requires: %{name}-libs =3D %{version}-%{release} =20 %description wireshark --=20 2.28.0 From nobody Fri May 3 20:37:24 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=1605287346; cv=none; d=zohomail.com; s=zohoarc; b=UsgC0WFpHxN6PBwrdpYWhQxxkJj8QgVnl7r+oe7yNhaKSMM8wMyZ3f25H7XMVQTkpVwXVtRiFU83OXr1eurXhJ9YeTPHj+2uEQ/H50Cdeu92zklm1UpzC4OCazXYg/KIrTSoM8QZVvA/qb18NoV9Bcd8G25QrTKxn9RKjSUh8yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605287346; 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=nCyqt3n2RZaw1/RqrdSnjUaSKlK/hnWMjXeFS8r1BHQ=; b=hjDHl5K+FRPJcByj2s4s7g7uHikKyPDXgJxagXcyE3WSkMZLJ/dcn1L+1GfSpNXeCrP4c3OEWMAdz7cZ7kXSlZci2ALG+xwUXko53BLW1dsQmUMqmAu8eDAcvgu36DsBStMtvnanSEGOJRCmKttfHPUGGIQza3oh7fqKxirlJxk= 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 1605287346498911.7221198298067; Fri, 13 Nov 2020 09:09:06 -0800 (PST) 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-287-lIBwYb57ME-nzDjrYIEboA-1; Fri, 13 Nov 2020 12:09:01 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 17476805F08; Fri, 13 Nov 2020 17:08:54 +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 CD54D73661; Fri, 13 Nov 2020 17:08:53 +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 6E3B5181A884; Fri, 13 Nov 2020 17:08:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ADH3XAX030839 for ; Fri, 13 Nov 2020 12:03:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id C09605C5BB; Fri, 13 Nov 2020 17:03:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-180.ams2.redhat.com [10.36.113.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01C895C1C7; Fri, 13 Nov 2020 17:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605287345; 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=nCyqt3n2RZaw1/RqrdSnjUaSKlK/hnWMjXeFS8r1BHQ=; b=cu/F3I/lvyDdD7AHXgH4ecMDXIdw5gNr4lYA67AUvMQjcEgG/g8CiETh6jriHmyjphTDE1 Beb7XBHJ8ZJoleF640wjfeFn5E9QB6DvMELlRpPN7kMFxRsKCKyGq205No/z4RF9IbuzSb tjrPM/zEwVsJirjJE0E9I5CZKlp3ykA= X-MC-Unique: lIBwYb57ME-nzDjrYIEboA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] rpm: enable wireshark build for RHEL-8 and later Date: Fri, 13 Nov 2020 17:03:18 +0000 Message-Id: <20201113170318.100088-5-berrange@redhat.com> In-Reply-To: <20201113170318.100088-1-berrange@redhat.com> References: <20201113170318.100088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) wireshark plugin was disabled in RHEL because RHEL-7 was too old, but we forgot to enable it in RHEL-8 where it builds fine. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 43955b0e09..de76878bc6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -167,8 +167,8 @@ %define with_libssh2 0%{!?_without_libssh2:1} %endif =20 -# Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer -%if 0%{?fedora} +# 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 --=20 2.28.0