From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 25 Sep 2020 09:37:30 +0000 (+0100)
Subject: meson: drop HTML4 variants of rst2html
X-Git-Tag: v6.8.0-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76356ea7600ba9815fb942c1e852b5c76364b936;p=thirdparty%2Flibvirt.git

meson: drop HTML4 variants of rst2html

We stopped supporting Ubuntu 16.04 earlier in the year in:

  commit 57e9f3a7e02988432c8c6790cb058b2b5372821b
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Mon May 4 13:06:56 2020 +0100

    gitlab: update list of distros to use latest versions

So there is no reason to keep the HTML4 variants of rst2html around.

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index bc52079809..2e57a435df 100644
--- a/meson.build
+++ b/meson.build
@@ -898,8 +898,7 @@ required_programs = [
 
 required_programs_groups = [
   {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']},
-  # Drop the rst2html (aka HTML4) variants once we stop supporting Ubuntu 16.04 (Xenial)
-  {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3', 'rst2html', 'rst2html.py', 'rst2html-3']},
+  {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3']},
   {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']},
 ]