Accepting request 745173 from devel:tools:scm

- 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch: Don't remove
  "-x manpage.xsl" option
- BuildRequire docbook5-xsl-stylesheets
- git 2.24.0
  * The command line parser learned "--end-of-options" notation.
  * A mechanism to affect the default setting for a (related) group of
    configuration variables is introduced.
  * "git fetch" learned "--set-upstream" option to help those who first
    clone from their private fork they intend to push to, add the true
    upstream via "git remote add" and then "git fetch" from it.
  * fixes and improvements to UI, workflow and features, bash completion fixes
- modified patch 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch
  * part of it merged upstream
  * the Makefile attempted to download some documentation, banned

OBS-URL: https://build.opensuse.org/request/show/745173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=240

0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch

@@ -11,32 +11,10 @@ is thus time for us to move to newer support as well.
  contrib/subtree/Makefile | 5 +++--
  2 files changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/Documentation/Makefile b/Documentation/Makefile
+Index: git-2.24.0/contrib/subtree/Makefile
-index 6d738f831e..dcb8f60b37 100644
+===================================================================
---- a/Documentation/Makefile
+--- git-2.24.0.orig/contrib/subtree/Makefile
-+++ b/Documentation/Makefile
++++ git-2.24.0/contrib/subtree/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   =
@@ -61,6 +39,3 @@ index 6906aae441..09e53b9480 100644
  
  $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
  	$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
--- 
-2.21.0
-

git-2.23.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067
-size 5707148

git-2.24.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f71d61973626d8b28c4cdf8e2484b4bf13870ed643fed982d68b2cfd754371b
+size 5766056

git.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Nov  4 10:45:32 UTC 2019 - Andreas Schwab <schwab@linux-m68k.org>
+
+- 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch: Don't remove
+  "-x manpage.xsl" option
+- BuildRequire docbook5-xsl-stylesheets
+
+-------------------------------------------------------------------
+Mon Nov  4 09:28:56 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+
+- git 2.24.0
+  * The command line parser learned "--end-of-options" notation.
+  * A mechanism to affect the default setting for a (related) group of
+    configuration variables is introduced.
+  * "git fetch" learned "--set-upstream" option to help those who first
+    clone from their private fork they intend to push to, add the true
+    upstream via "git remote add" and then "git fetch" from it.
+  * fixes and improvements to UI, workflow and features, bash completion fixes
+- modified patch 0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch
+  * part of it merged upstream
+  * the Makefile attempted to download some documentation, banned
+
 -------------------------------------------------------------------
 Mon Oct  7 11:58:26 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 

git.spec

@@ -29,7 +29,7 @@
 %bcond_without git_libsecret
 %bcond_without docs
 Name:           git
-Version:        2.23.0
+Version:        2.24.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -82,6 +82,7 @@ Suggests:       git-web
 %if %{with docs}
 %if 0%{?suse_version} > 1320
 BuildRequires:  rubygem(asciidoctor)
+BuildRequires:  docbook5-xsl-stylesheets
 %else
 BuildRequires:  asciidoc
 %endif