build-doc: allow building docs on fedora 30

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit e17e4bfcc048abd1757c3efd12c7443169d67477)

diff --git a/admin/build-doc b/admin/build-doc
index 6e94d459d3f5d265ca8c24fa04b4c52b99093078..2be20fce712d9c2845e794f11296c3df5c4a7142 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -20,7 +20,8 @@ if command -v dpkg >/dev/null; then
         exit 1
     fi
 elif command -v yum >/dev/null; then
-    for package in python-devel python-pip python-virtualenv doxygen ditaa ant libxml2-devel libxslt-devel Cython graphviz; do
+    python_package="python$(rpm --eval '%{python3_pkgversion}')"
+    for package in "$python_package"-devel "$python_package"-pip "$python_package"-virtualenv doxygen ditaa ant libxml2-devel libxslt-devel "$python_package"-Cython graphviz; do
        if ! rpm -q --whatprovides $package >/dev/null ; then
                missing="${missing:+$missing }$package"
        fi

diff --git a/doc/radosgw/pubsub-module.rst b/doc/radosgw/pubsub-module.rst
index 9be303b857263bc2491f52c0fd1322a179843066..11dbd7e1e3f43f7a7139655f9eaa1c4f5eb158c0 100644 (file)
--- a/doc/radosgw/pubsub-module.rst
+++ b/doc/radosgw/pubsub-module.rst
@@ -43,8 +43,7 @@ PubSub Zone Configuration
 -------------------------
 
 The pubsub sync module requires the creation of a new zone in a `Multisite`_ environment.
-First, a master zone must exist (see: :ref:`master-zone-label`), 
-then a secondary zone should be created (see :ref:`secondary-zone-label`).
+First, a master zone must exist, then a secondary zone should be created.
 In the creation of the secondary zone, its tier type must be set to ``pubsub``:
 
 ::