From a34e5898ebba1f1c4247ec131241890a1f3acd6b Mon Sep 17 00:00:00 2001
From: zhanghan <zhanghan@kylinos.cn>
Date: Tue, 22 Aug 2023 09:50:29 +0800
Subject: [PATCH] add %s to extlinks and format

(cherry picked from commit c137edc238acff9b59dff1e6efaaee7f3f34623e)
---
 add-s-to-extlinks-and-format.patch | 28 ++++++++++++++++++++++++++++
 percona-xtrabackup.spec            |  7 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 add-s-to-extlinks-and-format.patch

diff --git a/add-s-to-extlinks-and-format.patch b/add-s-to-extlinks-and-format.patch
new file mode 100644
index 0000000..04533fe
--- /dev/null
+++ b/add-s-to-extlinks-and-format.patch
@@ -0,0 +1,28 @@
+From 2f00255aeb6485d88d2efc6989d948d96718d920 Mon Sep 17 00:00:00 2001
+From: zhanghan <zhanghan@kylinos.cn>
+Date: Tue, 22 Aug 2023 10:53:03 +0800
+Subject: [PATCH] add %s to extlinks  and format
+
+---
+ storage/innobase/xtrabackup/doc/source/conf.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/storage/innobase/xtrabackup/doc/source/conf.py b/storage/innobase/xtrabackup/doc/source/conf.py
+index f690cca..11b9bf1 100644
+--- a/storage/innobase/xtrabackup/doc/source/conf.py
++++ b/storage/innobase/xtrabackup/doc/source/conf.py
+@@ -129,9 +129,8 @@ rst_prolog = '''
+ 
+ '''
+ 
+-extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s',
+-                   '#'), 'mysqlbug': ('http://bugs.mysql.com/bug.php?id=%s',
+-                   '#')}
++extlinks = {'bug': ('https://bugs.launchpad.net/percona-xtrabackup/+bug/%s','#%s'), 
++            'mysqlbug': ('http://bugs.mysql.com/bug.php?id=%s','#%s')}
+ 
+ # A list of ignored prefixes for module index sorting.
+ #modindex_common_prefix = []
+-- 
+2.33.0
+
diff --git a/percona-xtrabackup.spec b/percona-xtrabackup.spec
index cc34c81..51bf997 100644
--- a/percona-xtrabackup.spec
+++ b/percona-xtrabackup.spec
@@ -1,13 +1,14 @@
 Name: percona-xtrabackup
 Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
 Version: 2.3.6
-Release: 2
+Release: 3
 License: GPLv2
 URL: http://www.percona.com/software/percona-xtrabackup/
 Source: percona-xtrabackup-%{version}.tar.gz
 Patch1: gcc-7-flags-fix.patch
 Patch2: compilec-fix.patch
 Patch3: gcc-10-cflags-fix.patch
+Patch4: add-s-to-extlinks-and-format.patch
 
 Provides: %{name}
 
@@ -52,6 +53,7 @@ This package contains the test suite for Percona Xtrabackup
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -97,6 +99,9 @@ popd
 %doc COPYING
 
 %changelog
+* Tue Aug 22 2023 zhanghan <zhanghan@kylinos.cn> - 2.3.6-3
+- add %s to extlinks and format
+
 * Mon Aug 2 2021 bzhaoop <bzhaojyathousandy@gmail.com> - 2.3.6-2
 - Fix gcc 10 compiling issue