Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2019-12-07 15:19:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Sat Dec 7 15:19:55 2019 rev:241 rq:752814 version:2.24.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2019-11-08 15:22:02.858761316 +0100 +++ /work/SRC/openSUSE:Factory/.git.new.4691/git.changes 2019-12-07 15:23:08.047730922 +0100 @@ -1,0 +2,17 @@ +Fri Nov 29 14:57:55 UTC 2019 - Stefan Brüns <[email protected]> + +- Guard xmlto/sgml-skel BuildRequires by docs bcond. +- Fix building with asciidoctor and without DocBook4 stylesheets: + * Add 0002-Also-use-DocBook-5-stylesheet-when-generating-HTML-o.patch + * Refresh 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch +- Spec file cleanup, remove conditionals for obsolete/EOLed distros. +- Drop curl (executable) BuildRequires, only required by some skipped + tests (skipped as these have an apache2 prerequisite). + +------------------------------------------------------------------- +Fri Nov 29 10:22:06 UTC 2019 - Marketa Calabkova <[email protected]> + +- added patch git-skip-test-s390x-aarch64-fail.patch + * workaround for bsc#1156651 + +------------------------------------------------------------------- New: ---- 0002-Also-use-DocBook-5-stylesheet-when-generating-HTML-o.patch git-skip-test-s390x-aarch64-fail.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.6yLlaq/_old 2019-12-07 15:23:08.675730835 +0100 +++ /var/tmp/diff_new_pack.6yLlaq/_new 2019-12-07 15:23:08.683730834 +0100 @@ -1,7 +1,7 @@ # # spec file for package git # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,20 @@ %define gitexecdir %{_libexecdir}/git -%if 0%{?suse_version} >= 1210 -%bcond_without git_gnome_keyring -%else -%bcond_with git_gnome_keyring -%endif + #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif +%bcond_without git_gnome_keyring %bcond_without git_libsecret %bcond_without docs +%if 0%{?suse_version} >= 1500 && %{with docs} +%bcond_without asciidoctor +%else +%bcond_with asciidoctor +%endif + Name: git Version: 2.24.0 Release: 0 @@ -54,7 +57,9 @@ Patch8: git-asciidoc.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 +# workaround for bsc#1156651, try to build without it when updating +Patch12: git-skip-test-s390x-aarch64-fail.patch +Patch13: 0002-Also-use-DocBook-5-stylesheet-when-generating-HTML-o.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: libcurl-devel @@ -64,11 +69,9 @@ BuildRequires: perl-Error BuildRequires: perl-MailTools BuildRequires: python3-base -BuildRequires: sgml-skel BuildRequires: systemd-rpm-macros BuildRequires: tcsh BuildRequires: update-desktop-files -BuildRequires: xmlto BuildRequires: xz BuildRequires: zlib-devel Requires: git-core = %{version} @@ -80,9 +83,11 @@ Suggests: git-daemon Suggests: git-web %if %{with docs} -%if 0%{?suse_version} > 1320 -BuildRequires: rubygem(asciidoctor) +BuildRequires: sgml-skel +BuildRequires: xmlto +%if %{with asciidoctor} BuildRequires: docbook5-xsl-stylesheets +BuildRequires: rubygem(asciidoctor) %else BuildRequires: asciidoc %endif @@ -116,11 +121,7 @@ Requires: perl-Error Requires: rsync Obsoletes: git-remote-helpers < %{version} -%if 0%{?suse_version} >= 1230 %{perl_requires} -%else -Requires: perl-base = %{perl_version} -%endif %description core Git is a fast, scalable, distributed revision control system with an @@ -132,9 +133,7 @@ %package doc Summary: Documentation for the Git version control system Group: Documentation/HTML -%if 0%{?suse_version} >= 1210 BuildArch: noarch -%endif %description doc Git is a fast, scalable, distributed revision control system with an @@ -148,13 +147,9 @@ Summary: Git tools for importing Subversion repositories Group: Development/Tools/Version Control Requires: git-core = %{version} +Requires: perl-Term-ReadKey Requires: subversion Requires: subversion-perl -%if 0%{?suse_version} < 1140 -Requires: perl-TermReadKey -%else -Requires: perl-Term-ReadKey -%endif %description svn Tools for importing Subversion repositories to the Git version control @@ -292,6 +287,8 @@ %patch8 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build cat > .make <<'EOF' @@ -305,9 +302,9 @@ NO_INSTALL_HARDLINKS=1 \ %if 0%{?suse_version} > 1320 DC_SHA1_EXTERNAL=YesPlease \ -%if %{with docs} - USE_ASCIIDOCTOR=YesPlease \ %endif +%if %{with asciidoctor} + USE_ASCIIDOCTOR=YesPlease \ %endif PYTHON_PATH=%{_bindir}/python3 \ USE_LIBPCRE2=YesPlease \ @@ -507,9 +504,6 @@ %dir %{gitexecdir}/mergetools %{gitexecdir}/mergetools/guiffy %{_bindir}/git-new-workdir -%if 0%{?suse_version} < 1140 -%{_localstatedir}/adm/perl-modules/%{name} -%endif %attr(-,root,root) %{perl_vendorlib}/* %{_sysconfdir}/bash_completion.d/*.sh %{_datadir}/tcsh ++++++ 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch ++++++ --- /var/tmp/diff_new_pack.6yLlaq/_old 2019-12-07 15:23:08.707730831 +0100 +++ /var/tmp/diff_new_pack.6yLlaq/_new 2019-12-07 15:23:08.707730831 +0100 @@ -1,20 +1,19 @@ -From 5264df9284461edb4ae2309ad72acf7c3d8161e9 Mon Sep 17 00:00:00 2001 +From f901c954d1882ef24fcf3a1642d46eb785a1863f 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 +Subject: [PATCH 1/2] 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(-) + 1 file changed, 3 insertions(+), 2 deletions(-) -Index: git-2.24.0/contrib/subtree/Makefile -=================================================================== ---- git-2.24.0.orig/contrib/subtree/Makefile -+++ git-2.24.0/contrib/subtree/Makefile +diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile +index 6906aae..09e53b9 100644 +--- a/contrib/subtree/Makefile ++++ b/contrib/subtree/Makefile @@ -25,12 +25,13 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA = @@ -39,3 +38,6 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT) $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \ +-- +2.24.0 + ++++++ 0002-Also-use-DocBook-5-stylesheet-when-generating-HTML-o.patch ++++++ >From c83742bc6a8e0662aafa6a0fb3779fa3e333ee24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Fri, 29 Nov 2019 15:53:38 +0100 Subject: [PATCH 2/2] Also use DocBook 5 stylesheet when generating HTML output xsl/current refers to DocBook 4, while DocBook 5 uses xsl-ns/current. Make sure the stylesheet is also used for contrib/subtree, as xmlto otherwise defaults to DocBook 4. --- Documentation/Makefile | 4 +++- Documentation/docbook5.xsl | 8 ++++++++ contrib/subtree/Makefile | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Documentation/docbook5.xsl diff --git a/Documentation/Makefile b/Documentation/Makefile index 06d85ad..606b00f 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -205,6 +205,9 @@ ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl +XSLT = docbook5.xsl +else +XSLT = docbook.xsl endif SHELL_PATH ?= $(SHELL) @@ -397,7 +400,6 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.tx SubmittingPatches.txt: SubmittingPatches $(QUIET_GEN) cp $< $@ -XSLT = docbook.xsl XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css user-manual.html: user-manual.xml $(XSLT) diff --git a/Documentation/docbook5.xsl b/Documentation/docbook5.xsl new file mode 100644 index 0000000..ab95b94 --- /dev/null +++ b/Documentation/docbook5.xsl @@ -0,0 +1,8 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; + version='1.0'> + <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/> + <xsl:output method="html" + encoding="UTF-8" indent="no" + doctype-public="-//W3C//DTD HTML 4.01//EN" + doctype-system="http://www.w3.org/TR/html4/strict.dtd"; /> +</xsl:stylesheet> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 09e53b9..5905a31 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -25,7 +25,6 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_EXTRA = XMLTO = xmlto -XMLTO_EXTRA = --skip-validation ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor @@ -34,6 +33,8 @@ ASCIIDOC_HTML = xhtml5 ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +XMLTO_EXTRA += --skip-validation +XMLTO_EXTRA += -x ../../Documentation/manpage.xsl endif ifndef SHELL_PATH -- 2.24.0 ++++++ git-skip-test-s390x-aarch64-fail.patch ++++++ Index: git-2.24.0/t/t7812-grep-icase-non-ascii.sh =================================================================== --- git-2.24.0.orig/t/t7812-grep-icase-non-ascii.sh +++ git-2.24.0/t/t7812-grep-icase-non-ascii.sh @@ -74,11 +74,4 @@ test_expect_success GETTEXT_LOCALE,LIBPC test_cmp expected actual ' -test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' ' - test_might_fail git grep -hi "Æ" invalid-0x80 >actual && - test_cmp expected actual && - test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 && - test_cmp expected actual -' - test_done
