From 425f3a39fa0e3c11476d9c5d260d6af0878490fc Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 5 Oct 2020 19:59:56 -0400 Subject: [PATCH] update to 2.29.0-rc0 Delete references to contrib/svn-fe, it was deleted in upstream commit fc47391e24 (drop vcs-svn experiment, 2020-08-13). Release notes: https://github.com/git/git/raw/v2.29.0-rc0/Documentation/RelNotes/2.29.0.txt --- git.spec | 20 +++++++++++--------- sources | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/git.spec b/git.spec index 381fe31..89cc229 100644 --- a/git.spec +++ b/git.spec @@ -86,11 +86,11 @@ %endif # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 Name: git -Version: 2.28.0 -Release: 1%{?rcrev}%{?dist} +Version: 2.29.0 +Release: 0.0%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -621,12 +621,11 @@ sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \ contrib/hg-to-git/hg-to-git.py \ contrib/hooks/multimail/git_multimail.py \ contrib/hooks/multimail/migrate-mailhook-config \ - contrib/hooks/multimail/post-receive.example \ - contrib/svn-fe/svnrdump_sim.py + contrib/hooks/multimail/post-receive.example %else -# Remove contrib/fast-import/import-zips.py, contrib/hg-to-git, and -# contrib/svn-fe which all require python2. -rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git contrib/svn-fe +# Remove contrib/fast-import/import-zips.py and contrib/hg-to-git which all +# require python2. +rm -rf contrib/fast-import/import-zips.py contrib/hg-to-git %endif # endif with python2 @@ -795,7 +794,7 @@ not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|git mkdir -p %{buildroot}%{_pkgdocdir}/ cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/ # Remove contrib/ files/dirs which have nothing useful for documentation -rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential,svn-fe}/ +rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential}/ cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb cp -p gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb @@ -1058,6 +1057,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Oct 05 2020 Todd Zullinger - 2.29.0-0.0.rc0 +- update to 2.29.0-rc0 + * Mon Jul 27 2020 Todd Zullinger - 2.28.0-1 - update to 2.28.0 diff --git a/sources b/sources index 1d08be9..90b5f11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.28.0.tar.xz) = a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a -SHA512 (git-2.28.0.tar.sign) = 1af9fde8650307712c99fcb58f031aba3e5efa56977989023db3f0977e6a9d0a8c1f6f32a8eb698932f9b9cc2bd6f6b04f16619294e8cbfb2e9c11fb994214f2 +SHA512 (git-2.29.0.rc0.tar.xz) = 81f28ef88fe4fd11c31bfde70062f8c5cbf4a661d85d21480c74660d296c3989a8e9490503048caf27b2f29dabb6dae28a4097f9f03d13ab932b964b3f4d6f46 +SHA512 (git-2.29.0.rc0.tar.sign) = 9b5a801f6dbab1367b3f22871efd750a4e845a97829559441432cd19a858acdf1c1d292a0f7ecf7a52d8a00d5fa553a692af700ba42b34ac1b123e8f89bb4669