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 <phrdina@redhat.com>
---
 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 = find_program('rst2man')
+prog_rst2man = find_program('rst2man', 'rst2man.py', 'rst2man-3')
 
 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 >= %{meson_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: libvirt-devel >= %{libvirt_version}
 BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version}
-BuildRequires: /usr/bin/rst2man
+%if 0%{?rhel} == 7
+BuildRequires: python36-docutils
+%else
+BuildRequires: python3-docutils
+%endif
 
 Requires: dbus
 Requires: glib2 >= %{glib2_version}
-- 
2.25.4

On Mon, Apr 27, 2020 at 06:17:14PM +0200, Pavel Hrdina wrote:
> 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.

nitpick  s/binary/command/  since python scripts aren't binaries :-)

> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  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 = find_program('rst2man')
> +prog_rst2man = find_program('rst2man', 'rst2man.py', 'rst2man-3')
>  
>  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 >= %{meson_version}
>  BuildRequires: glib2-devel >= %{glib2_version}
>  BuildRequires: libvirt-devel >= %{libvirt_version}
>  BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version}
> -BuildRequires: /usr/bin/rst2man
> +%if 0%{?rhel} == 7
> +BuildRequires: python36-docutils
> +%else
> +BuildRequires: python3-docutils
> +%endif

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On Mon, Apr 27, 2020 at 05:19:27PM +0100, Daniel P. Berrangé wrote:
> On Mon, Apr 27, 2020 at 06:17:14PM +0200, Pavel Hrdina wrote:
> > 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.
> 
> nitpick  s/binary/command/  since python scripts aren't binaries :-)

Right :) that's better, I did not like the 'binary' as well but for some
reason I was not able to recall 'command'.

Thanks.