rpms/cifs-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update the rst2man patch to upstream version

Browse Source
This commit is contained in:
Alexander Bokovoy 2018-07-17 13:16:04 +03:00
parent bbf0d849b7
commit 660646924a
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cifs-utils-rst2man-3.patch
View File

@ -1,28 +1,50 @@
From 9ef872e140e04864d6e8b42f75ba184357b79a05 Mon Sep 17 00:00:00 2001 From d098b1f3ae1d4c69f34cbe4ec792d0521f35503c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org> From: Alexander Bokovoy <ab@samba.org>
Date: Tue, 17 Jul 2018 08:22:23 +0300 Date: Tue, 17 Jul 2018 08:22:23 +0300
Subject: [PATCH] configure.ac: support using both rst2man and rst2man-3 Subject: [PATCH] configure.ac: support using both rst2man and rst2man-3
Python3 version of rst2man is called rst2man-3. Python3 version of rst2man is called rst2man-3.
Add few more variants to cover Fedora and OpenSUSE.
Signed-off-by: Alexander Bokovoy <ab@samba.org> Signed-off-by: Alexander Bokovoy <ab@samba.org>
--- ---
configure.ac | 2 +- Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) configure.ac | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 30658e3..f37c9ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ man_MANS=
SUFFIXES = .rst .1 .8
-RST2MAN = rst2man --syntax-highlight=none $< $@
+RST2MAN = $(have_rst2man) --syntax-highlight=none $< $@
.rst.1:
$(RST2MAN)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index b0bc2b9..26d60ea 100644 index b0bc2b9..8e3d6ce 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -252,7 +252,7 @@ fi @@ -252,12 +252,12 @@ fi
# if docs are not disabled, check if rst2man is available # if docs are not disabled, check if rst2man is available
if test $enable_man != "no"; then if test $enable_man != "no"; then
- AC_CHECK_PROG(have_rst2man, rst2man, yes, no) - AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
+ AC_CHECK_PROGS(have_rst2man, rst2man-3 rst2man, no) + AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no)
if test $have_rst2man = "no"; then if test $have_rst2man = "no"; then
if test $enable_man = "yes"; then if test $enable_man = "yes"; then
AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.]) - AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.])
+ AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils.])
else
- AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation.])
+ AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation.])
enable_man="no"
fi
else
-- --
2.17.1 2.17.1