From aad0b9e056c3673087c73e70f931b5c0093df4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
Date: Tue, 3 Oct 2023 15:31:37 +0200
Subject: [PATCH 1/2] update to 2.42.0

---
 git.spec | 5 ++++-
 sources  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/git.spec b/git.spec
index 75c41fd..756357d 100644
--- a/git.spec
+++ b/git.spec
@@ -77,7 +77,7 @@
 %global _package_note_file  %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
 
 Name:           git
-Version:        2.41.0
+Version:        2.42.0
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
@@ -1039,6 +1039,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Tue Oct 03 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.42.0-1
+- update to 2.42.0
+
 * Thu Jun 01 2023 Todd Zullinger <tmz@pobox.com> - 2.41.0-1
 - update to 2.41.0
 
diff --git a/sources b/sources
index d13f7c2..bbad81c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0
-SHA512 (git-2.41.0.tar.sign) = 140f088254997e05bb444ed25f18ae9cadec9c24081acfc66670f153cbeecd2cdb722b07b5678da95c578dd29ad81dcf683264a503b37d63400f0746bbfa8762
+SHA512 (git-2.42.0.tar.xz) = afe5bca3c084d4ddd66f20afa820ba10f61007f66846108929e0d4ee7b7eaa896fcf00917dead16881d840f674dec6dd0e353a05e62a31016694af3d7d22a51d
+SHA512 (git-2.42.0.tar.sign) = 847914db4f035095643cf38af87e53be82b0d10c0fdcb862f5015df01662c15d6d77410e4f4aaa5ad510d9d82c830a0218465d10905f3ec048929b1c02be6d5d

From b644b8d4a1bec0175843764ed102f854113ffd02 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Wed, 1 Nov 2023 21:22:49 +0000
Subject: [PATCH 2/2] remove explicit BR for apr-util-bdb (#2247532)

---
 git.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/git.spec b/git.spec
index 756357d..79364eb 100644
--- a/git.spec
+++ b/git.spec
@@ -78,7 +78,7 @@
 
 Name:           git
 Version:        2.42.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Version Control System
 License:        BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 URL:            https://git-scm.com/
@@ -192,9 +192,11 @@ BuildRequires:  zlib-devel >= 1.2
 %if %{with tests}
 # Test suite requirements
 BuildRequires:  acl
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# Needed by t5540-http-push-webdav.sh
+%if (0%{?fedora} && 0%{?fedora} < 40) || (0%{?rhel} >= 8 && 0%{?rhel} < 10)
+# Needed by t5540-http-push-webdav.sh; recent httpd obviates this
 BuildRequires: apr-util-bdb
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 8
 # Needed by t5559-http-fetch-smart-http2.sh
 BuildRequires: mod_http2
 %endif
@@ -1039,6 +1041,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Wed Nov  1 2023 Joe Orton <jorton@redhat.com> - 2.42.0-2
+- remove explicit BR for apr-util-bdb (#2247532)
+
 * Tue Oct 03 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.42.0-1
 - update to 2.42.0