Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2019-05-15 12:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Wed May 15 12:24:30 2019 rev:232 rq:702617 version:2.21.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2019-04-17 11:21:20.470276694 +0200 +++ /work/SRC/openSUSE:Factory/.git.new.5148/git.changes 2019-05-15 12:24:32.138082947 +0200 @@ -1,0 +2,7 @@ +Wed May 8 17:02:10 UTC 2019 - Dominique Leuenberger <[email protected]> + +- Add 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch: Move + to DocBook 5.x. Asciidoctor 2.x no longer supports the legacy + DocBook 4.5 format. + +------------------------------------------------------------------- New: ---- 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.vfU1Oe/_old 2019-05-15 12:24:32.986081041 +0200 +++ /var/tmp/diff_new_pack.vfU1Oe/_new 2019-05-15 12:24:32.990081032 +0200 @@ -56,6 +56,7 @@ Patch8: git-asciidoc.patch Patch9: worktree-fix-worktree-add-race.patch Patch10: setup-don-t-fail-if-commondir-reference-is-deleted.patch +Patch11: 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch BuildRequires: curl BuildRequires: fdupes BuildRequires: gpg2 @@ -214,9 +215,9 @@ Summary: Git tools for sending email Group: Development/Tools/Version Control Requires: git-core = %{version} -Requires: perl-MailTools # For sending mails over secure SMTP: Requires: perl-Authen-SASL +Requires: perl-MailTools Requires: perl-Net-SMTP-SSL %description email @@ -229,10 +230,10 @@ Requires(pre): %fillup_prereq Requires(pre): %{_sbindir}/useradd Requires(pre): shadow +%{?systemd_requires} %if 0%{?suse_version} >= 1500 Requires(pre): group(nogroup) %endif -%{?systemd_requires} %description daemon A really simple TCP git daemon. In the default configuration it allows @@ -292,6 +293,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build cat > .make <<'EOF' ++++++ 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch ++++++ >From 5264df9284461edb4ae2309ad72acf7c3d8161e9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Wed, 8 May 2019 19:00:47 +0200 Subject: [PATCH] DOC: Move to DocBook 5 when using asciidoctor DocBook 5 has been released about a decade ago. Newer versions of asciidoctor (since version 2.x) no longer support DocBook 4.5, it is thus time for us to move to newer support as well. --- Documentation/Makefile | 4 ++-- contrib/subtree/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 6d738f831e..dcb8f60b37 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -124,7 +124,7 @@ TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl XMLTO = xmlto -XMLTO_EXTRA = +XMLTO_EXTRA = --skip-validation INSTALL ?= install RM ?= rm -f MAN_REPO = ../../git-manpages @@ -193,7 +193,7 @@ ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 6906aae441..09e53b9480 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -25,12 +25,13 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA = XMLTO = xmlto +XMLTO_EXTRA = --skip-validation ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook45 +ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' endif @@ -78,7 +79,7 @@ install-html: $(GIT_SUBTREE_HTML) $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir) $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) - $(XMLTO) -m $(MANPAGE_XSL) man $^ + $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \ -- 2.21.0
