Doc: Pacemaker Explained: Add replace for PCMK__REMOTE_SCHEMA_DIR
(cherry picked from commit d2e8a00b315b4cecdede2a11629e17ca12ea4294)
This commit is contained in:
parent
0fb0e42b84
commit
1431e3ae59
42
Add_replace_for_PCMK__REMOTE_SCHEMA_DIR.patch
Normal file
42
Add_replace_for_PCMK__REMOTE_SCHEMA_DIR.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From a3bffc7c66bf6f796f977cffd44f223635b008c5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Reid Wahl <nrwahl@protonmail.com>
|
||||||
|
Date: Wed, 20 Dec 2023 13:33:47 -0800
|
||||||
|
Subject: [PATCH] Doc: Pacemaker Explained: Add replace for
|
||||||
|
PCMK__REMOTE_SCHEMA_DIR
|
||||||
|
|
||||||
|
So that the existing use in local-options.rst expands correctly.
|
||||||
|
|
||||||
|
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||||
|
---
|
||||||
|
doc/sphinx/Makefile.am | 1 +
|
||||||
|
doc/sphinx/conf.py.in | 1 +
|
||||||
|
3 files changed, 2 insertions(+)
|
||||||
|
create mode 100644 doc/sphinx/conf.py.in.rej
|
||||||
|
|
||||||
|
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
|
||||||
|
index e48e19a..d0309ff 100644
|
||||||
|
--- a/doc/sphinx/Makefile.am
|
||||||
|
+++ b/doc/sphinx/Makefile.am
|
||||||
|
@@ -134,6 +134,7 @@ $(BOOKS:%=%/conf.py): conf.py.in
|
||||||
|
-e 's#%CRM_SCHEMA_DIRECTORY%#@CRM_SCHEMA_DIRECTORY@#g' \
|
||||||
|
-e 's#%PACEMAKER_CONFIG_DIR%#@PACEMAKER_CONFIG_DIR@#g' \
|
||||||
|
-e 's#%PCMK_GNUTLS_PRIORITIES%#@PCMK_GNUTLS_PRIORITIES@#g' \
|
||||||
|
+ -e 's#%PCMK__REMOTE_SCHEMA_DIR%#@PCMK__REMOTE_SCHEMA_DIR@#g' \
|
||||||
|
$(<) > "$@"
|
||||||
|
|
||||||
|
$(BOOK)/_build: $(STATIC_FILES) $(BOOK)/conf.py $(DEPS_$(BOOK)) $(wildcard $(srcdir)/$(BOOK)/*.rst)
|
||||||
|
diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
|
||||||
|
index 556eb72..511f029 100644
|
||||||
|
--- a/doc/sphinx/conf.py.in
|
||||||
|
+++ b/doc/sphinx/conf.py.in
|
||||||
|
@@ -40,6 +40,7 @@ rst_prolog="""
|
||||||
|
.. |PCMK_INIT_ENV_FILE| replace:: ``%PACEMAKER_CONFIG_DIR%/pcmk-init.env``
|
||||||
|
.. |PCMK_LOG_FILE| replace:: %CRM_LOG_DIR%/pacemaker.log
|
||||||
|
.. |PCMK_GNUTLS_PRIORITIES| replace:: %PCMK_GNUTLS_PRIORITIES%
|
||||||
|
+.. |PCMK__REMOTE_SCHEMA_DIR| replace:: %PCMK__REMOTE_SCHEMA_DIR%
|
||||||
|
.. |REMOTE_DISTRO| replace:: AlmaLinux
|
||||||
|
.. |REMOTE_DISTRO_VER| replace:: 9
|
||||||
|
"""
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -17,7 +17,7 @@
|
|||||||
## can be incremented to build packages reliably considered "newer"
|
## can be incremented to build packages reliably considered "newer"
|
||||||
## than previously built packages with the same pcmkversion)
|
## than previously built packages with the same pcmkversion)
|
||||||
%global pcmkversion 2.1.7
|
%global pcmkversion 2.1.7
|
||||||
%global specversion 2
|
%global specversion 3
|
||||||
|
|
||||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||||
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
||||||
@ -149,6 +149,7 @@ Url: https://www.clusterlabs.org/
|
|||||||
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
||||||
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
||||||
Source2: pacemaker.sysusers
|
Source2: pacemaker.sysusers
|
||||||
|
Patch0: Add_replace_for_PCMK__REMOTE_SCHEMA_DIR.patch
|
||||||
|
|
||||||
Requires: resource-agents
|
Requires: resource-agents
|
||||||
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
Requires: %{pkgname_pcmk_libs} = %{version}-%{release}
|
||||||
@ -756,6 +757,9 @@ exit 0
|
|||||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 20 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-3
|
||||||
|
- Doc: Pacemaker Explained: Add replace for PCMK__REMOTE_SCHEMA_DIR
|
||||||
|
|
||||||
* Fri Mar 15 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-2
|
* Fri Mar 15 2024 zouzhimin <zouzhimin@kylinos.cn> - 2.1.7-2
|
||||||
- update to Pacemaker 2.1.7 - Final
|
- update to Pacemaker 2.1.7 - Final
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user