David Mulder
47eae704ae
- Update to cifs-utils 6.8. + document more mount options + man pages now generated from RST files + add python-docutils build dependency + update keyring to check tarball signature - Add typo corrections, better doc and configure fixes from upstream + add 0001-docs-cleanup-rst-formating.patch + add 0002-mount.cifs.rst-document-new-no-handlecache-mount-opt.patch + add 0003-manpage-update-mount.cifs-manpage-with-info-about-rd.patch + add 0004-checkopts-add-python-script-to-cross-check-mount-opt.patch + add 0005-mount.cifs.rst-document-missing-options-correct-wron.patch + add 0006-cifs-utils-support-rst2man-3.patch + add 0007-checkopts-report-duplicated-options-in-man-page.patch + add 0008-mount.cifs.rst-more-cleanups.patch + add 0009-mount.cifs.rst-document-vers-3-mount-option.patch + add 0010-mount.cifs.rst-document-vers-3.02-mount-option.patch - Cleanup spec file * assume SUSE vendor and SLE >= 11 OBS-URL: https://build.opensuse.org/request/show/634977 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=153
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From a389756f51916995d27819ea1807ab03f36d8dd7 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Bokovoy <ab@samba.org>
|
|
Date: Tue, 17 Jul 2018 13:12:44 +0300
|
|
Subject: [PATCH 06/10] cifs-utils: support rst2man-3
|
|
|
|
Python3 version of rst2man is called rst2man-3
|
|
|
|
Signed-off-by: Alexander Bokovoy <ab@samba.org>
|
|
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
|
|
---
|
|
Makefile.am | 2 +-
|
|
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
|
|
index b0bc2b9..8e3d6ce 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -252,12 +252,12 @@ fi
|
|
|
|
# if docs are not disabled, check if rst2man is available
|
|
if test $enable_man != "no"; then
|
|
- AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
|
|
+ AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no)
|
|
if test $have_rst2man = "no"; 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 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.13.7
|
|
|