From d547c32f138d819554df76a684a189c156f55d24c21e61bea8338bec18d164ba Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Nov 2019 14:21:58 +0000 Subject: [PATCH] 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 --- ...-to-DocBook-5-when-using-asciidoctor.patch | 33 +++--------------- git-2.23.0.tar.sign | Bin 566 -> 0 bytes git-2.23.0.tar.xz | 3 -- git-2.24.0.tar.sign | Bin 0 -> 566 bytes git-2.24.0.tar.xz | 3 ++ git.changes | 22 ++++++++++++ git.spec | 3 +- 7 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 git-2.23.0.tar.sign delete mode 100644 git-2.23.0.tar.xz create mode 100644 git-2.24.0.tar.sign create mode 100644 git-2.24.0.tar.xz diff --git a/0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch b/0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch index e80028a..de1afd3 100644 --- a/0001-DOC-Move-to-DocBook-5-when-using-asciidoctor.patch +++ b/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 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 +Index: git-2.24.0/contrib/subtree/Makefile +=================================================================== +--- git-2.24.0.orig/contrib/subtree/Makefile ++++ git-2.24.0/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 - diff --git a/git-2.23.0.tar.sign b/git-2.23.0.tar.sign deleted file mode 100644 index 45eb08131db3845e387131fcac1fc67254c4db99ebd15cd90c098381063b7138..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cd8{JTS6B4-lz6xt5{Db3;gyAYN<&@i6Q;UtDiYs{!Fj_ zzdTw%>I8Pc^yJceL`%kUk7eoTJ!-s0`{7MA5dt0t^kaIbp?$8fQevr6$2dC}j#y$n z<+X$O`JMX3FlV^xG}5u{^Okx>Q+N(($ArNIIrb)74@vH}H?oxC?KS18* z4gqxE+5XnG5Ltg9s-|}04xrWrLf_BvB1algZ@9<7n0*vGlY9xO(i)jh;4vBcBE&Zx zh)*AaY^Z=KyLbs?&gKrRk5E!schiQ_-EKo+k9-tu+Tw7uUW0bm<>)+(WW1hhQDIhyYtGxJhkj4P1;1qtjw^prxazIHU_20jS9u<*K;I1oy`KSY z1u0lc8er*@lJZeC0noMtY6}Ztq`#`5hMU%}tO}}k3JkN^qGF-%uRRq0Nr1v3QMc6a zOxPs7DXtcR90<`jF>GjvFT38$$>m?XnD+3L6e~QikoWwCWH@wyDcy{|Pb@-?hh$Dp zH1V7r6NC$R^~03neKd*lo?dui+C|~f((Nn8HQEDOGvxhE^J77C^%bpU6LS+>%@Bjb+ diff --git a/git-2.23.0.tar.xz b/git-2.23.0.tar.xz deleted file mode 100644 index 2898006..0000000 --- a/git-2.23.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067 -size 5707148 diff --git a/git-2.24.0.tar.sign b/git-2.24.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ff5fe562a0f30e289dfa32a38d70be3ecd3d4cc3f6bf0a2dfa06b0ba7440a57d GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+ccAQ5U{oA zhL*49%L7vo0N0TlqYDF{b@L$!ZG#fbF2x|f;Ibj8LXG<3mBiIxEP`d}Zt`QXV*fUz zC3)k;*EL)Tm7X8}huXM3*Fac(33dts-v^r{$$pK7vYA$tM@}b-@T=E~!&HR29@u5Y z$F>mQ5s2i2FCR(d4|`p6*ki5^)4~<-g|rb*>|8~_UCbO=sLGOMqkhjG^vDo@Tyc~b zJ)pxZ{9uCYTokhyPi7c*>H@I!4YK6@JLEuL{Xz??a76oAG9NRV1ThY}4LRCsBYIK# z9$D1OB?|YmYRj}vb!?GnjuC9tdXBGMaD>i$?V?QgTJUoT+H+if8#6;h9N_;_?xSJmc^2(atw z;8GLfL~;IaIfK)cEa4X3rP3$!Uwis@j;0muHw`!0>cTOzu?}y0565CPhsD(qC-ADh z6{$^;OD03VXB9LrDCfNgKtnX^)=RxkiGs4 z6~?k&>R3WT)q*h8h|wPvG4XC~tLi}PxjF?W9tRqUM* z;A&P7b?!-{oBbOSTh=e4Pc+itT&VyxEbf<-oU5J+a4L;?QStP~IPp>+%CiHgBeSS; E*ycqOqW}N^ literal 0 HcmV?d00001 diff --git a/git-2.24.0.tar.xz b/git-2.24.0.tar.xz new file mode 100644 index 0000000..d09ce87 --- /dev/null +++ b/git-2.24.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f71d61973626d8b28c4cdf8e2484b4bf13870ed643fed982d68b2cfd754371b +size 5766056 diff --git a/git.changes b/git.changes index 37d4e78..63a9eb9 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Nov 4 10:45:32 UTC 2019 - Andreas Schwab + +- 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 + +- 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 diff --git a/git.spec b/git.spec index a1d0043..ef2be0a 100644 --- a/git.spec +++ b/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