diff --git a/0001-doc-add-bundle-format-to-TECH_DOCS.patch b/0001-doc-add-bundle-format-to-TECH_DOCS.patch new file mode 100644 index 0000000..6f03eb1 --- /dev/null +++ b/0001-doc-add-bundle-format-to-TECH_DOCS.patch @@ -0,0 +1,28 @@ +From c221f23ebe2defeb31cfcab6387f8985b5c863bb Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Tue, 12 Oct 2021 21:00:55 -0400 +Subject: [PATCH] doc: add bundle-format to TECH_DOCS + +A link to the bundle-format was added in 5c8273d57c (bundle doc: rewrite +the "DESCRIPTION" section, 2021-07-31). + +Ensure `technical/bundle-format.html` is created to avoid a broken link +in `git-bundle.html`. + +Signed-off-by: Todd Zullinger +--- + Documentation/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index f5605b7767..2021568cd5 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -90,6 +90,7 @@ SP_ARTICLES += $(API_DOCS) + TECH_DOCS += MyFirstContribution + TECH_DOCS += MyFirstObjectWalk + TECH_DOCS += SubmittingPatches ++TECH_DOCS += technical/bundle-format + TECH_DOCS += technical/hash-function-transition + TECH_DOCS += technical/http-protocol + TECH_DOCS += technical/index-format diff --git a/git.spec b/git.spec index 2044845..85cea81 100644 --- a/git.spec +++ b/git.spec @@ -79,7 +79,7 @@ #global rcrev .rc0 Name: git -Version: 2.33.0 +Version: 2.33.1 Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -112,6 +112,10 @@ Source99: print-failed-test-output # https://bugzilla.redhat.com/490602 Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# fix the broken link in git-bundle.html +# https://lore.kernel.org/git/20211013032852.959985-1-tmz@pobox.com/ +Patch1: 0001-doc-add-bundle-format-to-TECH_DOCS.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: %{_bindir}/pod2man @@ -984,6 +988,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Oct 13 2021 Todd Zullinger - 2.33.1-1 +- update to 2.33.1 + * Mon Sep 27 2021 Ondřej Pohořelský - 2.33.0-1 - update to 2.33.0 - contrib/hooks/multimail is no longer distributed with git diff --git a/sources b/sources index 9d2e906..3340d14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.33.0.tar.xz) = 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd -SHA512 (git-2.33.0.tar.sign) = 5d6788588a1cb87874ac09d4b0a30b0280d00872617aff2dbae3d1f25eda35095d00b0451c03f262da6c991c46c228f4dcdf02456805b497ffd8ba5bddd942fe +SHA512 (git-2.33.1.tar.xz) = 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 +SHA512 (git-2.33.1.tar.sign) = b1a8d3b4ebbf5db43eb1234446b903d62637999390e59f94b9793bf8c8c302ff6d7b74f48cdfe3b4a304f767641ccba96479ddf5a19c6e6d4861da1e568e9760