docs/meson: fix rst2man detection

phrdina · phrdina · commit 0e209d5a43b8 · 2020-04-27T18:22:19.000+02:00
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 command names.

Signed-off-by: Pavel Hrdina &lt;phrdina@redhat.com&gt;
Reviewed-by: Daniel P. Berrangé &lt;berrange@redhat.com&gt;
diff --git 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
@@ -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}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-prog_rst2man = find_program('rst2man')`
	`1`	`+prog_rst2man = find_program('rst2man', 'rst2man.py', 'rst2man-3')`
`2`	`2`
`3`	`3`	`configure_file(`
`4`	`4`	`command: [prog_rst2man.path(), '@INPUT@', '@OUTPUT@'],`