Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2021-07-02 13:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bind" Fri Jul 2 13:26:24 2021 rev:168 rq:902727 version:9.16.18 Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2021-06-25 15:01:26.984159758 +0200 +++ /work/SRC/openSUSE:Factory/.bind.new.2625/bind.changes 2021-07-02 13:26:32.161194033 +0200 @@ -1,0 +2,6 @@ +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. + +------------------------------------------------------------------- @@ -10,0 +17,5 @@ + +------------------------------------------------------------------- +Sat Jun 19 13:11:07 UTC 2021 - Callum Farmer <gmbr3@opensuse.org> + +- Add now working CONFIG parameter to sysusers generator New: ---- bind-fix-build-with-older-sphinx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.uS7gb5/_old 2021-07-02 13:26:32.733189595 +0200 +++ /var/tmp/diff_new_pack.uS7gb5/_new 2021-07-02 13:26:32.737189565 +0200 @@ -65,6 +65,7 @@ Source72: named.conf Patch52: named-bootconf.diff Patch56: bind-ldapdump-use-valid-host.patch +Patch68: bind-fix-build-with-older-sphinx.patch BuildRequires: libcap-devel BuildRequires: libmysqlclient-devel BuildRequires: libopenssl-devel @@ -167,6 +168,13 @@ done 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 autoreconf -fvi export CFLAGS="%{optflags} -fPIE -DNO_VERSION_DATE" @@ -209,7 +217,7 @@ make -C doc/${d} SPHINXBUILD=sphinx-build doc done %if %{with_systemd} -%sysusers_generate_pre %{SOURCE72} named +%sysusers_generate_pre %{SOURCE72} named named.conf %endif %install ++++++ bind-fix-build-with-older-sphinx.patch ++++++ 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.