Architecture specific change in rpms/git.git

The package rpms/git.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/git.git/commit/?id=0d294dd61006522f5....

Change:
-%ifarch %{power64}

Thanks.

Full change:
============

commit 0d294dd61006522f5434a82f76ad186aa19d052c
Author: Todd Zullinger 
Date:   Fri Aug 19 21:52:40 2022 -0400

tests: try harder to find open ports for apache, git, and svn

When running multiple builds, we frequently see failures due to port
    conflicts, particularly with httpd tests.  Retry with a different port
    when the test function start_httpd() fails to reduce these spurious
    failures.

We should not need to skip t9115-git-svn-dcommit-funky-renames as a
    result.  Remove it from GIT_SKIP_TESTS.

Similarly, adjust the git-daemon and svnserve start functions.

diff --git a/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
new file mode 100644
index 0000000..f7c1509
--- /dev/null
+++ b/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
@@ -0,0 +1,73 @@
+From aedeaaf788bd8a7fc5a1887196b6f6d8a5c31362 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger 
+Date: Sun, 21 Aug 2022 13:49:57 -0400
+Subject: [PATCH] t/lib-httpd: try harder to find a port for apache
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When running multiple builds concurrently, tests which run daemons, like
+apache httpd, sometimes conflict with each other, leading to spurious
+failures:
+
+    ++ /usr/sbin/httpd -d '/tmp/git-t.ck9I/trash directory.t9118-git-svn-funky-branch-names/httpd' \
+       -f /builddir/build/BUILD/git-2.37.2/t/lib-httpd/apache.conf -DDAV -DSVN -c 'Listen 127.0.0.1:9118' \
+       -k start
+    (98)Address already in use: AH00072: make_sock: could not bind to address 127.0.0.1:9118
+    no listening sockets available, shutting down
+    AH00015: Unable to open logs
+    ++ test 1 -ne 0
+
+Try a bit harder to find an open port to use to avoid these intermittent
+failures.  If we fail to start httpd, increment the port number and try
+again.  By default, we make 3 attempts.  This may be overridden by
+setting GIT_TEST_START_HTTPD_TRIES to a different value.
+
+Helped-by: Ondřej Pohořelský 
+Signed-off-by: Todd Zullinger 
+---
+ t/lib-httpd.sh | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
+index 1f6b9b08d1..9279dcd659 100644
+--- a/t/lib-httpd.sh
++++ b/t/lib-httpd.sh
+@@ -175,19 +175,26 @@ prepare_httpd() {
+ }
+ 
+ start_httpd() {
+-	prepare_httpd >&3 2>&4
+-
+ 	test_atexit stop_httpd
+ 
+-	"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
+-		-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
+-		-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
+-		>&3 2>&4
+-	if test $? -ne 0
+-	then
+-		cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
+-		test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
+-	fi
++	i=0
++	while test $i -lt ${GIT_TEST_START_HTTPD_TRIES:-3}
++	do
++		i=$(($i + 1))
++		prepare_httpd >&3 2>&4
++		say >&3 "Starting httpd on port $LIB_HTTPD_PORT"
++		"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
++			-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
++			-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
++			>&3 2>&4
++		test $? -eq 0 && return
++		LIB_HTTPD_PORT=$(($LIB_HTTPD_PORT + 1))
++		export LIB_HTTPD_PORT
++		# clean up modules symlink, prepare_httpd will re-create it
++		rm -f "$HTTPD_ROOT_PATH/modules"
++	done
++	cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
++	test_skip_or_die GIT_TEST_HTTPD "web server setup failed"
+ }
+ 
+ stop_httpd() {
diff --git a/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
new file mode 100644
index 0000000..4540b63
--- /dev/null
+++ b/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
@@ -0,0 +1,88 @@
+From 16750d024ce038b019ab2e9ee5639901e445af37 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger 
+Date: Fri, 26 Aug 2022 18:28:44 -0400
+Subject: [PATCH] t/lib-git-daemon: try harder to find a port
+
+As with the previous commit, try harder to find an open port to avoid
+intermittent failures on busy/shared build systems.
+
+By default, we make 3 attempts.  This may be overridden by setting
+GIT_TEST_START_GIT_DAEMON_TRIES to a different value.
+
+Signed-off-by: Todd Zullinger 
+---
+ t/lib-git-daemon.sh | 60 ++++++++++++++++++++++++++++-----------------
+ 1 file changed, 37 insertions(+), 23 deletions(-)
+
+diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
+index e62569222b..c3e8dda9ff 100644
+--- a/t/lib-git-daemon.sh
++++ b/t/lib-git-daemon.sh
+@@ -51,30 +51,44 @@ start_git_daemon() {
+ 		registered_stop_git_daemon_atexit_handler=AlreadyDone
+ 	fi
+ 
+-	say >&3 "Starting git daemon ..."
+-	mkfifo git_daemon_output
+-	${LIB_GIT_DAEMON_COMMAND:-git daemon} \
+-		--listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
+-		--reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
+-		--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
+-		"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
+-		>&3 2>git_daemon_output &
+-	GIT_DAEMON_PID=$!
+-	{
+-		read -r line <&7
+-		printf "%s\n" "$line" >&4
+-		cat <&7 >&4 &
+-	} 7<git_daemon_output &&
++	i=0
++	while test $i -lt ${GIT_TEST_START_GIT_DAEMON_TRIES:-3}
++	do
++		say >&3 "Starting git daemon on port $LIB_GIT_DAEMON_PORT ..."
++		mkfifo git_daemon_output
++		${LIB_GIT_DAEMON_COMMAND:-git daemon} \
++			--listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
++			--reuseaddr --verbose --pid-file="$GIT_DAEMON_PIDFILE" \
++			--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
++			"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
++			>&3 2>git_daemon_output &
++		GIT_DAEMON_PID=$!
++		{
++			read -r line <&7
++			printf "%s\n" "$line" >&4
++			cat <&7 >&4 &
++		} 7<git_daemon_output &&
+ 
+-	# Check expected output
+-	if test x"$(expr "$line" : "[[0-9]*] (.*)")" != x"Ready to rumble"
+-	then
+-		kill "$GIT_DAEMON_PID"
+-		wait "$GIT_DAEMON_PID"
+-		unset GIT_DAEMON_PID
+-		test_skip_or_die GIT_TEST_GIT_DAEMON \
+-			"git daemon failed to start"
+-	fi
++		# Check expected output
++		output="$(expr "$line" : "[[0-9]*] (.*)")"
++		# Return if found
++		test x"$output" = x"Ready to rumble" && return
++		# Increment port for retry if not found
++		LIB_GIT_DAEMON_PORT=$(($LIB_GIT_DAEMON_PORT + 1))
++		export LIB_GIT_DAEMON_PORT
++		GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
++		GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
++		# unset GIT_DAEMON_PID; remove the fifo & pid file
++		GIT_DAEMON_PID=
++		rm -f git_daemon_output "$GIT_DAEMON_PIDFILE"
++	done
++
++	# Clean up and return failure
++	kill "$GIT_DAEMON_PID"
++	wait "$GIT_DAEMON_PID"
++	unset GIT_DAEMON_PID
++	test_skip_or_die GIT_TEST_GIT_DAEMON \
++		"git daemon failed to start"
+ }
+ 
+ stop_git_daemon() {
diff --git a/0003-t-lib-git-svn-try-harder-to-find-a-port.patch b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch
new file mode 100644
index 0000000..56624e2
--- /dev/null
+++ b/0003-t-lib-git-svn-try-harder-to-find-a-port.patch
@@ -0,0 +1,85 @@
+From aa5105dc115b43edc6c9c11714b092583f1221aa Mon Sep 17 00:00:00 2001
+From: Todd Zullinger 
+Date: Fri, 26 Aug 2022 18:28:44 -0400
+Subject: [PATCH] t/lib-git-svn: try harder to find a port
+
+As with the previous commits, try harder to find an open port to avoid
+intermittent failures on busy/shared build systems.
+
+By default, we make 3 attempts.  This may be overridden by setting
+GIT_TEST_START_SVNSERVE_TRIES to a different value.
+
+Run svnserve in daemon mode and use 'test_atexit' to stop it.  This is
+cleaner than running in the foreground with --listen-once and having to
+manage the PID ourselves.
+
+Signed-off-by: Todd Zullinger 
+---
+ t/lib-git-svn.sh                    | 34 +++++++++++++++++++++++++----
+ t/t9113-git-svn-dcommit-new-file.sh |  1 -
+ 2 files changed, 30 insertions(+), 5 deletions(-)
+
+diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
+index ea28971e8e..04e660e2ba 100644
+--- a/t/lib-git-svn.sh
++++ b/t/lib-git-svn.sh
+@@ -17,6 +17,7 @@ fi
+ GIT_DIR=$PWD/.git
+ GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
+ SVN_TREE=$GIT_SVN_DIR/svn-tree
++SVNSERVE_PIDFILE="$PWD"/daemon.pid
+ test_set_port SVNSERVE_PORT
+ 
+ svn >/dev/null 2>&1
+@@ -119,10 +120,35 @@ require_svnserve () {
+ }
+ 
+ start_svnserve () {
+-	svnserve --listen-port $SVNSERVE_PORT \
+-		 --root "$rawsvnrepo" \
+-		 --listen-once \
+-		 --listen-host 127.0.0.1 &
++	test_atexit stop_svnserve
++
++	i=0
++	while test $i -lt ${GIT_TEST_START_SVNSERVE_TRIES:-3}
++	do
++		say >&3 "Starting svnserve on port $SVNSERVE_PORT ..."
++		svnserve --listen-port $SVNSERVE_PORT \
++			 --root "$rawsvnrepo" \
++			 --daemon --pid-file="$SVNSERVE_PIDFILE" \
++			 --listen-host 127.0.0.1
++		ret=$?
++		# increment port and retry if unsuccessful
++		if test $ret -ne 0
++		then
++			SVNSERVE_PORT=$(($SVNSERVE_PORT + 1))
++			export SVNSERVE_PORT
++		else
++			break
++		fi
++	done
++}
++
++stop_svnserve () {
++	say >&3 "Stopping svnserve ..."
++	SVNSERVE_PID="$(cat "$SVNSERVE_PIDFILE")"
++	if test -n "$SVNSERVE_PID"
++	then
++		kill "$SVNSERVE_PID" 2>/dev/null
++	fi
+ }
+ 
+ prepare_utf8_locale () {
+diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.sh
+index e8479cec7a..5925891f5d 100755
+--- a/t/t9113-git-svn-dcommit-new-file.sh
++++ b/t/t9113-git-svn-dcommit-new-file.sh
+@@ -28,7 +28,6 @@ test_expect_success 'create files in new directory with dcommit' "
+ 	echo hello > git-new-dir/world &&
+ 	git update-index --add git-new-dir/world &&
+ 	git commit -m hello &&
+-	start_svnserve &&
+ 	git svn dcommit
+ 	"
+ 
diff --git a/git.spec b/git.spec
index f234f02..2d1fab2 100644
--- a/git.spec
+++ b/git.spec
@@ -109,6 +109,16 @@ Source99:       print-failed-test-output
 # https://bugzilla.redhat.com/490602
 Patch0:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch

+# https://bugzilla.redhat.com/2114531
+# tests: try harder to find open ports for apache, git, and svn
+#
+# https://github.com/tmzullinger/git/commit/aedeaaf788
+Patch1:         0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch
+# https://github.com/tmzullinger/git/commit/16750d024c
+Patch2:         0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
+# https://github.com/tmzullinger/git/commit/aa5105dc11
+Patch3:         0003-t-lib-git-svn-try-harder-to-find-a-port.patch
+
 %if %{with docs}
 # pod2man is needed to build Git.3pm
 BuildRequires:  %{_bindir}/pod2man
@@ -794,17 +804,6 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5541.36 t5551.25"
 %endif
 # endif aarch64 %%{arm} %%{power64}

-%ifarch %{power64}
-# Skip tests which fail on ppc
-#
-# t9115-git-svn-dcommit-funky-renames is disabled because it frequently fails.
-# The port it uses (9115) is already in use.  It is unclear if this is
-# due to an issue in the test suite or a conflict with some other process on
-# the build host.  It only appears to occur on ppc-arches.
-GIT_SKIP_TESTS="$GIT_SKIP_TESTS t9115"
-%endif
-# endif %%{power64}
-
 %if 0%{?rhel} == 8 && "%{_arch}" == "s390x"
 # Skip tests which fail on s390x on rhel-8
 #
@@ -1009,6 +1008,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 * Tue Aug 30 2022 Todd Zullinger  - 2.37.3-1
 - update to 2.37.3
 - remove %%changelog entries prior to 2020
+- tests: try harder to find open ports for apache, git, and svn

* Sun Aug 14 2022 Todd Zullinger  - 2.37.2-2
 - consolidate git-archimport removal in %%prep

commit cbc4c3e411cc105150a1d9444dd327a6a5aec6f5
Author: Todd Zullinger 
Date:   Sun Aug 21 19:27:34 2022 -0400

remove %changelog entries prior to 2020

The git history serves as the repository for the old entries.  The
    changelog was roughly 20% of the total lines in the spec file.

diff --git a/git.spec b/git.spec
index 51023d9..f234f02 100644
--- a/git.spec
+++ b/git.spec
@@ -1008,6 +1008,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %changelog
 * Tue Aug 30 2022 Todd Zullinger  - 2.37.3-1
 - update to 2.37.3
+- remove %%changelog entries prior to 2020

* Sun Aug 14 2022 Todd Zullinger  - 2.37.2-2
 - consolidate git-archimport removal in %%prep
@@ -1198,252 +1199,3 @@ rmdir --ignore-fail-on-non-empty "$testdir"

* Tue Jan 26 2021 Fedora Release Engineering  - 2.30.0-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Dec 28 2020 Todd Zullinger  - 2.30.0-1
-- update to 2.30.0
-
-* Wed Dec 23 2020 Todd Zullinger  - 2.30.0-0.2.rc2
-- update to 2.30.0-rc2
-
-* Sat Dec 19 2020 Todd Zullinger  - 2.30.0-0.1.rc1
-- update to 2.30.0-rc1
-
-* Mon Dec 14 2020 Todd Zullinger  - 2.30.0-0.0.rc0
-- update to 2.30.0-rc0
-
-* Sun Dec 06 2020 Todd Zullinger  - 2.29.2-4
-- move git-difftool to git-core, it does not require perl
-
-* Wed Nov 25 2020 Todd Zullinger  - 2.29.2-3
-- apply upstream patch to resolve git fast-import memory leak (#1900335)
-- add epel-rpm-macros BuildRequires on EL-7 (#1872865)
-
-* Sat Nov 07 2020 Todd Zullinger  - 2.29.2-2
-- apply upstream patch to resolve git log segfault (#1791810)
-
-* Thu Oct 29 2020 Todd Zullinger  - 2.29.2-1
-- update to 2.29.2
-
-* Sat Oct 24 2020 Todd Zullinger  - 2.29.1-1
-- update to 2.29.1
-- fix bugs in am/rebase handling of committer ident/date
-
-* Mon Oct 19 2020 Todd Zullinger  - 2.29.0-1
-- update to 2.29.0
-
-* Thu Oct 15 2020 Todd Zullinger  - 2.29.0-0.2.rc2
-- update to 2.29.0-rc2
-
-* Fri Oct 09 2020 Todd Zullinger  - 2.29.0-0.1.rc1
-- update to 2.29.0-rc1
-- drop emacs-git stub for fedora >= 34 (#1882360)
-- adjust python hashbang in contrib/hg-to-git, it supports python3
-
-* 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
-
-* Mon Jul 27 2020 Fedora Release Engineering  - 2.28.0-0.3.rc2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Todd Zullinger  - 2.28.0-0.2.rc2
-- update to 2.28.0-rc2
-
-* Sat Jul 18 2020 Todd Zullinger  - 2.28.0-0.1.rc1
-- update to 2.28.0-rc1
-
-* Thu Jul 09 2020 Todd Zullinger  - 2.28.0-0.0.rc0
-- update to 2.28.0-rc0
-
-* Fri Jun 26 2020 Jitka Plesnikova  - 2.27.0-1.2
-- Perl 5.32 re-rebuild of bootstrapped packages
-
-* Tue Jun 23 2020 Jitka Plesnikova  - 2.27.0-1.1
-- Perl 5.32 rebuild
-
-* Mon Jun 01 2020 Todd Zullinger  - 2.27.0-1
-- update to 2.27.0
-
-* Tue May 26 2020 Todd Zullinger  - 2.27.0-0.2.rc2
-- update to 2.27.0-rc2
-
-* Thu May 21 2020 Todd Zullinger  - 2.27.0-0.1.rc1
-- update to 2.27.0-rc1
-
-* Thu May 21 2020 Merlin Mathesius  - 2.26.2-2
-- Minor conditional fixes for ELN
-
-* Mon Apr 20 2020 Todd Zullinger  - 2.26.2-1
-- update to 2.26.2 (CVE-2020-11008)
-
-* Tue Apr 14 2020 Todd Zullinger  - 2.26.1-1
-- update to 2.26.1 (CVE-2020-5260)
-
-* Sat Apr 04 2020 Todd Zullinger  - 2.26.0-2
-- fix issue with fast-forward rebases when rebase.abbreviateCommands is set
-- fix/quiet rpmlint issues from libsecret split
-
-* Thu Apr 02 2020 Björn Esser  - 2.26.0-1.1
-- Fix string quoting for rpm >= 4.16
-
-* Sun Mar 22 2020 Todd Zullinger  - 2.26.0-1
-- update to 2.26.0
-
-* Mon Mar 16 2020 Todd Zullinger  - 2.26.0-0.3.rc2
-- update to 2.26.0-rc2
-
-* Thu Mar 12 2020 Todd Zullinger  - 2.26.0-0.2.rc1
-- remove s390x gcc10 workaround (#1799408)
-
-* Tue Mar 10 2020 Todd Zullinger  - 2.26.0-0.1.rc1
-- update to 2.26.0-rc1
-- adjust make test options
-- add missing build deps for tests
-
-* Fri Mar 06 2020 Todd Zullinger  - 2.26.0-0.0.rc0
-- update to 2.26.0-rc0
-
-* Wed Feb 26 2020 Todd Zullinger  - 2.25.1-4
-- use Asciidoctor to build documentation when possible
-
-* Sat Feb 22 2020 Todd Zullinger  - 2.25.1-3
-- work around issue on s390x with gcc10 (#1799408)
-
-* Wed Feb 19 2020 Todd Zullinger  - 2.25.1-2
-- split libsecret credential helper into a subpackage (#1804741)
-- consolidate macros for Fedora/EPEL
-- remove unneeded gnome-keyring obsoletes
-
-* Mon Feb 17 2020 Todd Zullinger  - 2.25.1-1
-- update to 2.25.1
-
-* Tue Jan 28 2020 Fedora Release Engineering  - 2.25.0-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Tom Stellard  - 2.25.0-2
-- Use make_build macro when running tests
-
-* Tue Jan 14 2020 Todd Zullinger  - 2.25.0-1
-- update to 2.25.0
-
-* Thu Jan 09 2020 Todd Zullinger  - 2.25.0-0.2.rc2
-- update to 2.25.0-rc2
-
-* Fri Jan 03 2020 Todd Zullinger  - 2.25.0-0.1.rc1
-- update to 2.25.0-rc1
-- only add highlight test BR for ppc64le/x86_64 on EL7+
-
-* Wed Dec 25 2019 Todd Zullinger  - 2.25.0-0.0.rc0
-- update to 2.25.0-rc0
-
-* Thu Dec 19 2019 Todd Zullinger  - 2.24.1-2
-- fix git-daemon systemd scriptlets (#1785088)
-
-* Tue Dec 10 2019 Todd Zullinger  - 2.24.1-1
-- update to 2.24.1 (CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
-  CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387)
-
-* Wed Dec 04 2019 Todd Zullinger  - 2.24.0-2
-- restore jgit BR for use in tests
-
-* Mon Nov 04 2019 Todd Zullinger  - 2.24.0-1
-- update to 2.24.0
-
-* Thu Oct 31 2019 Todd Zullinger  - 2.24.0-0.2.rc2
-- update to 2.24.0-rc2
-
-* Sun Oct 27 2019 Todd Zullinger  - 2.24.0-0.1.rc1.1
-- disable linkchecker on all EL releases
-
-* Thu Oct 24 2019 Todd Zullinger  - 2.24.0-0.1.rc1
-- update to 2.24.0-rc1
-- skip failing test in t7812-grep-icase-non-ascii on s390x
-- gitk: add Requires: git-gui (#1765113)
-
-* Sat Oct 19 2019 Todd Zullinger  - 2.24.0-0.0.rc0
-- update to 2.24.0-rc0
-- fix t0500-progress-display on big-endian arches
-
-* Fri Aug 16 2019 Todd Zullinger  - 2.23.0-1
-- Update to 2.23.0
-
-* Sun Aug 11 2019 Todd Zullinger  - 2.23.0-0.2.rc2
-- Update to 2.23.0-rc2
-
-* Fri Aug 02 2019 Todd Zullinger  - 2.23.0-0.1.rc1
-- Update to 2.23.0-rc1
-
-* Mon Jul 29 2019 Todd Zullinger  - 2.23.0-0.0.rc0
-- Update to 2.23.0-rc0
-
-* Thu Jul 25 2019 Todd Zullinger  - 2.22.0-2
-- completion: do not cache if --git-completion-helper fails
-- avoid trailing comments in spec file
-- drop jgit on Fedora > 30
-
-* Thu Jul 25 2019 Fedora Release Engineering  - 2.22.0-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 07 2019 Todd Zullinger  - 2.22.0-1
-- Update to 2.22.0
-
-* Tue Jun 04 2019 Jitka Plesnikova  - 2.22.0-0.7.rc3
-- Perl 5.30 re-rebuild updated packages
-
-* Mon Jun 03 2019 Todd Zullinger  - 2.22.0-0.6.rc3
-- Update to 2.22.0-rc3
-
-* Sun Jun 02 2019 Jitka Plesnikova  - 2.22.0-0.5.rc2
-- Perl 5.30 re-rebuild of bootstrapped packages
-
-* Sat Jun 01 2019 Jitka Plesnikova  - 2.22.0-0.4.rc2
-- Perl 5.30 rebuild
-
-* Thu May 30 2019 Todd Zullinger  - 2.22.0-0.3.rc2
-- Update to 2.22.0-rc1
-
-* Fri May 24 2019 Todd Zullinger  - 2.22.0-0.2.rc1
-- Apply upstream fixes for diff-parseopt issues on s390x
-
-* Sun May 19 2019 Todd Zullinger  - 2.22.0-0.1.rc1
-- Update to 2.22.0-rc1
-
-* Mon May 13 2019 Todd Zullinger  - 2.22.0-0.0.rc0
-- Update to 2.22.0-rc0
-- Ensure a consistent format for test output
-- Improve JGIT test prereq (jgit on Fedora >= 30 is broken)
-- Add perl(JSON::PP) BuildRequires for trace2 tests
-
-* Sun Feb 24 2019 Todd Zullinger  - 2.21.0-1
-- Update to 2.21.0
-- Move gitweb manpages to gitweb package
-- Link git-citool to git-gui if they are identical
-
-* Tue Feb 19 2019 Todd Zullinger  - 2.21.0-0.2.rc2
-- Update to 2.21.0.rc2
-
-* Fri Feb 15 2019 Todd Zullinger 
-- Set SOURCE_DATE_EPOCH and TZ to improve build reproducibility
-
-* Wed Feb 13 2019 Todd Zullinger  - 2.21.0-0.1.rc1
-- Update to 2.21.0.rc1
-
-* Thu Feb 07 2019 Todd Zullinger  - 2.21.0-0.0.rc0
-- Update to 2.21.0.rc0
-- Remove %%changelog entries prior to 2017
-
-* Thu Jan 31 2019 Todd Zullinger  - 2.20.1-2
-- Remove extraneous pcre BuildRequires
-- Add additional BuildRequires for i18n locales used in tests
-- Replace gitweb home-link with inline sed
-- Add gnupg2-smime and perl JSON BuildRequires for tests
-- Work around gpg-agent issues in the test suite
-- Drop gnupg BuildRequires on fedora >= 30
-- Fix formatting of contrib/{contacts,subtree} docs
-- Use %%{build_cflags} and %%{build_ldflags}
-- Drop unneeded TEST_SHELL_PATH make variable
-
-* Thu Jan 31 2019 Fedora Release Engineering  - 2.20.1-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

commit c1a92d4bda57e39d25b1c908fd6c6ea1719b7f1c
Author: Todd Zullinger 
Date:   Tue Aug 30 21:09:04 2022 -0400

update to 2.37.3

This is an upstream bugfix release.

Release notes:
    https://github.com/git/git/raw/v2.37.3/Documentation/RelNotes/2.37.3.txt

diff --git a/git.spec b/git.spec
index 35651f6..51023d9 100644
--- a/git.spec
+++ b/git.spec
@@ -76,8 +76,8 @@
 %global _package_note_file  %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld

Name:           git
-Version:        2.37.2
-Release:        2%{?rcrev}%{?dist}
+Version:        2.37.3
+Release:        1%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -1006,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}

%changelog
+* Tue Aug 30 2022 Todd Zullinger  - 2.37.3-1
+- update to 2.37.3
+
 * Sun Aug 14 2022 Todd Zullinger  - 2.37.2-2
 - consolidate git-archimport removal in %%prep

diff --git a/sources b/sources
index c4e406c..4f304df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.37.2.tar.xz) = a26d83f4eeb71d49c427ced9509861f7677e13e806da729f369ca39b795f8417b789a0adec859f44716f7fbc1190f7d1e6e518e774ad95c89e88442ac125b9c2
-SHA512 (git-2.37.2.tar.sign) = 8ae911329f57df76e1fe9932ded46bf7a37350ae609802afa54da9d7c05be4d13907cae8585b8824b575d177a20dc11f3e555c820beb2cbf6d65509777faabda
+SHA512 (git-2.37.3.tar.xz) = 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f
+SHA512 (git-2.37.3.tar.sign) = ca2b0396c7d5f47822578f654588580b101ce97e0a4913071b6987cdbb470e3fad456b967cf6ec5928c85d56aa8a8eeff123e0e9aaa4ce1cbfc79c30a2af3b03

commit 3bf0a72eb1e3c5b367f03440f246fda9c7b822c1
Author: Todd Zullinger 
Date:   Sun Aug 14 14:13:49 2022 -0400

consolidate git-archimport removal in %prep

We have not shipped git-archimport since 3f0dc97 (Drop git-arch on
    fedora >= 16, 2011-07-26).  Replace the scattered references to it in
    the spec file with a small group of commands in %prep to remove it
    entirely.

diff --git a/git.spec b/git.spec
index af92750..35651f6 100644
--- a/git.spec
+++ b/git.spec
@@ -77,7 +77,7 @@

Name:           git
 Version:        2.37.2
-Release:        1%{?rcrev}%{?dist}
+Release:        2%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -496,8 +496,10 @@ xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1
 # Install print-failed-test-output script
 install -p -m 755 %{SOURCE99} print-failed-test-output

-# Remove git-archimport from command list
+# Remove git-archimport
+sed -i '/^SCRIPT_PERL += git-archimport.perl$/d' Makefile
 sed -i '/^git-archimport/d' command-list.txt
+rm git-archimport.perl Documentation/git-archimport.txt

%if %{without cvs}
 # Remove git-cvs* from command list
@@ -643,9 +645,6 @@ rm -rf contrib/scalar
 # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir
 rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t}

-# git-archimport is not supported
-find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';'
-
 %if %{without cvs}
 # Remove git-cvs* and gitcvs*
 find %{buildroot} Documentation ( -type f -o -type l ) \
@@ -663,7 +662,7 @@ rm -f %{buildroot}%{gitexecdir}/mergetools/p4merge
 # Remove unneeded git-remote-testsvn so git-svn can be noarch
 rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn

-exclude_re="archimport|email|git-(citool|credential-libsecret|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge"
+exclude_re="email|git-(citool|credential-libsecret|cvs|daemon|gui|instaweb|p4|subtree|svn)|gitk|gitweb|p4merge"
 (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
 (find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
 (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
@@ -1007,6 +1006,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}

%changelog
+* Sun Aug 14 2022 Todd Zullinger  - 2.37.2-2
+- consolidate git-archimport removal in %%prep
+
 * Thu Aug 11 2022 Todd Zullinger  - 2.37.2-1
 - update to 2.37.2