From nobody Sat May 4 20:08:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1588004252; cv=none; d=zohomail.com; s=zohoarc; b=GbcoYqjXsEBh0SNNhUo2YssjZY9jxC0IUdY+re13ikFW7xszjSvhuvaLTZlaaO10vVaix8Dhk0cTddRjpTEZA8h9sgxuIBiRFwdaijolVkFB/NRXDNIUTvGP38Uruh5rCu4dr5BX964Dgr0Fyz7xzyAVz5eND0F+10aYxtC6NKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588004252; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=HR+GXVXE+WcW97Eo9/unZ5WbbVy8zfB19r80dfK+n+o=; b=Zvaj77tIYN+AdJ4eoYITces//k/33+yvuxLWiH0w/9Mmwaa5KQK5sJSkDY9YlepAYCfhsEoW153u3SDBQkPvziFyUW8S4uBM9bW1bPMRSFIKzqwU5Q7Cc/MhZC5TEfpzdj7VVGEa/O4B0CBbkNuJsxD+fysJeTIVCIpuFVQ6i5A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588004252767215.2993720703662; Mon, 27 Apr 2020 09:17:32 -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-218-V7IzKmJxM9m0b3LGn9NLMA-1; Mon, 27 Apr 2020 12:17:29 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8D31872FE0; Mon, 27 Apr 2020 16:17:22 +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 AACBE5D9DA; Mon, 27 Apr 2020 16:17:21 +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 183D04CAA7; Mon, 27 Apr 2020 16:17:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03RGHIwa000679 for ; Mon, 27 Apr 2020 12:17:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4331E5D750; Mon, 27 Apr 2020 16:17:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.196.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id B32EC5D71E for ; Mon, 27 Apr 2020 16:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588004251; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HR+GXVXE+WcW97Eo9/unZ5WbbVy8zfB19r80dfK+n+o=; b=K12Kz13Vt43WCx+wIQqj6qDO2ZuQPGC/cN3B1skVXW2L7YK2woAgl5WFoCIspJknp2UwwN f/9PWa2JxGeFe3yKPTbtCGHuCMPi1RHFtbmYeoTiUD5lR02Zbitg/GPjHOeGhnaUOM7Zj+ qMB7Qzdjq97GX9xpGIexOmVScjEqn1k= X-MC-Unique: V7IzKmJxM9m0b3LGn9NLMA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt-dbus PATCH] docs/meson: fix rst2man detection Date: Mon, 27 Apr 2020 18:17:14 +0200 Message-Id: <39801b206c95f3a946ba191b1daa57f8681004d4.1588004197.git.phrdina@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.14 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" In libvirt project we use python3 version exclusively so we should do the same in libvirt-dbus. This means that we have to check other possible binary names. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/meson.build | 2 +- libvirt-dbus.spec.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index fbeaf12..c2e8ae7 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,4 +1,4 @@ -prog_rst2man =3D find_program('rst2man') +prog_rst2man =3D find_program('rst2man', 'rst2man.py', 'rst2man-3') =20 configure_file( command: [prog_rst2man.path(), '@INPUT@', '@OUTPUT@'], diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 84172fa..4e6ff85 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -19,7 +19,11 @@ BuildRequires: meson >=3D %{meson_version} BuildRequires: glib2-devel >=3D %{glib2_version} BuildRequires: libvirt-devel >=3D %{libvirt_version} BuildRequires: libvirt-glib-devel >=3D %{libvirt_glib_version} -BuildRequires: /usr/bin/rst2man +%if 0%{?rhel} =3D=3D 7 +BuildRequires: python36-docutils +%else +BuildRequires: python3-docutils +%endif =20 Requires: dbus Requires: glib2 >=3D %{glib2_version} --=20 2.25.4