diff options
| author | Daniel Salzman <daniel.salzman@nic.cz> | 2023-08-21 16:57:25 +0200 |
|---|---|---|
| committer | Daniel Salzman <daniel.salzman@nic.cz> | 2023-08-21 16:57:25 +0200 |
| commit | 9f832ad3474e64adeea284af34392f3f540271e8 (patch) | |
| tree | 0fc92123cfafc215c4ec97fdd006607e96ab3c2f /distro | |
| parent | distro/deb: add missing symbol knot_edns_opt_names (diff) | |
| download | knot-9f832ad3474e64adeea284af34392f3f540271e8.tar.xz knot-9f832ad3474e64adeea284af34392f3f540271e8.zip | |
distro/el-7: don't try to import sphinx_panels
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/pkg/el-7/03-doc-don-t-try-to-import-sphinx_panels.patch | 25 | ||||
| -rw-r--r-- | distro/pkg/el-7/knot.spec | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/distro/pkg/el-7/03-doc-don-t-try-to-import-sphinx_panels.patch b/distro/pkg/el-7/03-doc-don-t-try-to-import-sphinx_panels.patch new file mode 100644 index 000000000..8ef7e7e33 --- /dev/null +++ b/distro/pkg/el-7/03-doc-don-t-try-to-import-sphinx_panels.patch @@ -0,0 +1,25 @@ +From c05abb0401d3343b96ced4a6cdd724ee04adfe1b Mon Sep 17 00:00:00 2001 +From: Daniel Salzman <daniel.salzman@nic.cz> +Date: Mon, 21 Aug 2023 16:54:46 +0200 +Subject: [PATCH] doc: don't try to import sphinx_panels on CentOS 7 + + + 1 file changed, 3 deletions(-) + +diff --git a/doc/conf.py b/doc/conf.py +index fc2e94d96..515241051 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -27,9 +27,6 @@ sys.path.insert(0, os.path.abspath('ext')) + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-import importlib.util +-if importlib.util.find_spec("sphinx_panels"): +- extensions = [ 'sphinx_panels' ] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] +-- +2.25.1 + diff --git a/distro/pkg/el-7/knot.spec b/distro/pkg/el-7/knot.spec index 92d1c3875..49dcbc9c0 100644 --- a/distro/pkg/el-7/knot.spec +++ b/distro/pkg/el-7/knot.spec @@ -24,6 +24,7 @@ BuildRequires: gnupg2 Patch1: 01-revert-AC_PROG_CC.patch Patch2: 02-fix-compilation-by-using-SHA-1.patch +Patch3: 03-doc-don-t-try-to-import-sphinx_panels.patch # Required dependencies BuildRequires: autoconf |