Accepting request 902727 from network
OBS-URL: https://build.opensuse.org/request/show/902727 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bind?expand=0&rev=168
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
591a056177
108
bind-fix-build-with-older-sphinx.patch
Normal file
108
bind-fix-build-with-older-sphinx.patch
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
Index: b/doc/arm/conf.py
|
||||||
|
===================================================================
|
||||||
|
--- a/doc/arm/conf.py
|
||||||
|
+++ b/doc/arm/conf.py
|
||||||
|
@@ -18,54 +18,58 @@ from docutils.nodes import Node, system_
|
||||||
|
from docutils.parsers.rst import roles
|
||||||
|
|
||||||
|
from sphinx import addnodes
|
||||||
|
-from sphinx.util.docutils import ReferenceRole
|
||||||
|
+try:
|
||||||
|
+ from sphinx.util.docutils import ReferenceRole
|
||||||
|
|
||||||
|
+ GITLAB_BASE_URL = 'https://gitlab.isc.org/isc-projects/bind9/-/'
|
||||||
|
|
||||||
|
-GITLAB_BASE_URL = 'https://gitlab.isc.org/isc-projects/bind9/-/'
|
||||||
|
|
||||||
|
-
|
||||||
|
-# Custom Sphinx role enabling automatic hyperlinking to GitLab issues/MRs.
|
||||||
|
-class GitLabRefRole(ReferenceRole):
|
||||||
|
- def __init__(self, base_url: str) -> None:
|
||||||
|
- self.base_url = base_url
|
||||||
|
- super().__init__()
|
||||||
|
-
|
||||||
|
- def run(self) -> Tuple[List[Node], List[system_message]]:
|
||||||
|
- gl_identifier = '[GL %s]' % self.target
|
||||||
|
-
|
||||||
|
- target_id = 'index-%s' % self.env.new_serialno('index')
|
||||||
|
- entries = [('single', 'GitLab; ' + gl_identifier, target_id, '', None)]
|
||||||
|
-
|
||||||
|
- index = addnodes.index(entries=entries)
|
||||||
|
- target = nodes.target('', '', ids=[target_id])
|
||||||
|
- self.inliner.document.note_explicit_target(target)
|
||||||
|
-
|
||||||
|
- try:
|
||||||
|
- refuri = self.build_uri()
|
||||||
|
- reference = nodes.reference('', '', internal=False, refuri=refuri,
|
||||||
|
- classes=['gl'])
|
||||||
|
- if self.has_explicit_title:
|
||||||
|
- reference += nodes.strong(self.title, self.title)
|
||||||
|
- else:
|
||||||
|
- reference += nodes.strong(gl_identifier, gl_identifier)
|
||||||
|
- except ValueError:
|
||||||
|
- error_text = 'invalid GitLab identifier %s' % self.target
|
||||||
|
- msg = self.inliner.reporter.error(error_text, line=self.lineno)
|
||||||
|
- prb = self.inliner.problematic(self.rawtext, self.rawtext, msg)
|
||||||
|
- return [prb], [msg]
|
||||||
|
-
|
||||||
|
- return [index, target, reference], []
|
||||||
|
-
|
||||||
|
- def build_uri(self):
|
||||||
|
- if self.target[0] == '#':
|
||||||
|
- return self.base_url + 'issues/%d' % int(self.target[1:])
|
||||||
|
- if self.target[0] == '!':
|
||||||
|
- return self.base_url + 'merge_requests/%d' % int(self.target[1:])
|
||||||
|
- raise ValueError
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-def setup(_):
|
||||||
|
- roles.register_local_role('gl', GitLabRefRole(GITLAB_BASE_URL))
|
||||||
|
+ # Custom Sphinx role enabling automatic hyperlinking to GitLab issues/MRs.
|
||||||
|
+ class GitLabRefRole(ReferenceRole):
|
||||||
|
+ def __init__(self, base_url: str) -> None:
|
||||||
|
+ self.base_url = base_url
|
||||||
|
+ super().__init__()
|
||||||
|
+
|
||||||
|
+ def run(self) -> Tuple[List[Node], List[system_message]]:
|
||||||
|
+ gl_identifier = '[GL %s]' % self.target
|
||||||
|
+
|
||||||
|
+ target_id = 'index-%s' % self.env.new_serialno('index')
|
||||||
|
+ entries = [('single', 'GitLab; ' + gl_identifier, target_id, '', None)]
|
||||||
|
+
|
||||||
|
+ index = addnodes.index(entries=entries)
|
||||||
|
+ target = nodes.target('', '', ids=[target_id])
|
||||||
|
+ self.inliner.document.note_explicit_target(target)
|
||||||
|
+
|
||||||
|
+ try:
|
||||||
|
+ refuri = self.build_uri()
|
||||||
|
+ reference = nodes.reference('', '', internal=False, refuri=refuri,
|
||||||
|
+ classes=['gl'])
|
||||||
|
+ if self.has_explicit_title:
|
||||||
|
+ reference += nodes.strong(self.title, self.title)
|
||||||
|
+ else:
|
||||||
|
+ reference += nodes.strong(gl_identifier, gl_identifier)
|
||||||
|
+ except ValueError:
|
||||||
|
+ error_text = 'invalid GitLab identifier %s' % self.target
|
||||||
|
+ msg = self.inliner.reporter.error(error_text, line=self.lineno)
|
||||||
|
+ prb = self.inliner.problematic(self.rawtext, self.rawtext, msg)
|
||||||
|
+ return [prb], [msg]
|
||||||
|
+
|
||||||
|
+ return [index, target, reference], []
|
||||||
|
+
|
||||||
|
+ def build_uri(self):
|
||||||
|
+ if self.target[0] == '#':
|
||||||
|
+ return self.base_url + 'issues/%d' % int(self.target[1:])
|
||||||
|
+ if self.target[0] == '!':
|
||||||
|
+ return self.base_url + 'merge_requests/%d' % int(self.target[1:])
|
||||||
|
+ raise ValueError
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ def setup(_):
|
||||||
|
+ roles.register_local_role('gl', GitLabRefRole(GITLAB_BASE_URL))
|
||||||
|
+
|
||||||
|
+except ImportError:
|
||||||
|
+ # better loose this feature, than failing the build
|
||||||
|
+ pass
|
||||||
|
|
||||||
|
#
|
||||||
|
# Configuration file for the Sphinx documentation builder.
|
||||||
11
bind.changes
11
bind.changes
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jun 24 15:02:14 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
|
||||||
|
|
||||||
|
- Add patch bind-fix-build-with-older-sphinx.patch and sed fix
|
||||||
|
in order to build with older distributions.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jun 23 06:46:55 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
Wed Jun 23 06:46:55 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
||||||
|
|
||||||
@ -9,6 +15,11 @@ Wed Jun 23 06:46:55 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
|||||||
This has been fixed.
|
This has been fixed.
|
||||||
[bind-9.16.18.tar.xz, bind-9.16.18.tar.xz.sha512.asc]
|
[bind-9.16.18.tar.xz, bind-9.16.18.tar.xz.sha512.asc]
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jun 19 13:11:07 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
|
||||||
|
|
||||||
|
- Add now working CONFIG parameter to sysusers generator
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jun 17 09:01:18 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
Thu Jun 17 09:01:18 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
||||||
|
|
||||||
|
|||||||
10
bind.spec
10
bind.spec
@ -65,6 +65,7 @@ Source70: bind.conf
|
|||||||
Source72: named.conf
|
Source72: named.conf
|
||||||
Patch52: named-bootconf.diff
|
Patch52: named-bootconf.diff
|
||||||
Patch56: bind-ldapdump-use-valid-host.patch
|
Patch56: bind-ldapdump-use-valid-host.patch
|
||||||
|
Patch68: bind-fix-build-with-older-sphinx.patch
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: libmysqlclient-devel
|
BuildRequires: libmysqlclient-devel
|
||||||
BuildRequires: libopenssl-devel
|
BuildRequires: libopenssl-devel
|
||||||
@ -167,6 +168,13 @@ for file in docu/README* config/{README,named.conf} sysconfig/named-named; do
|
|||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150300
|
||||||
|
# the Administration Reference Manual doesn't build with Leap/SLES due to an way too old Sphinx package
|
||||||
|
# that is missing sphinx.util.docutils.ReferenceRole.
|
||||||
|
# patch68 disables this extension, and here, we're removing the :gl: tags in the notes
|
||||||
|
sed -i 's|:gl:||g' doc/notes/notes*.rst
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fvi
|
autoreconf -fvi
|
||||||
export CFLAGS="%{optflags} -fPIE -DNO_VERSION_DATE"
|
export CFLAGS="%{optflags} -fPIE -DNO_VERSION_DATE"
|
||||||
@ -209,7 +217,7 @@ for d in arm; do
|
|||||||
make -C doc/${d} SPHINXBUILD=sphinx-build doc
|
make -C doc/${d} SPHINXBUILD=sphinx-build doc
|
||||||
done
|
done
|
||||||
%if %{with_systemd}
|
%if %{with_systemd}
|
||||||
%sysusers_generate_pre %{SOURCE72} named
|
%sysusers_generate_pre %{SOURCE72} named named.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user