From a6a4a7187338ae98b68d846da556539575c7dc28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
Date: Tue, 30 Apr 2024 17:15:29 +0200
Subject: [PATCH] update to 2.45.2

add glibc-utils BuildRequires
build docs with asciidoc instead of a asciidoctor
drop git-p4 subpackage
Resolves: RHEL-45572, RHEL-45215
---
 git.spec | 30 ++++++++++++++++--------------
 sources  |  4 ++--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/git.spec b/git.spec
index dbcbdb7..f0f6dc0 100644
--- a/git.spec
+++ b/git.spec
@@ -21,8 +21,9 @@
 %bcond_without              perl_modcompat
 %endif
 
-# Settings for Fedora and EL >= 9
-%if 0%{?fedora} || 0%{?rhel} >= 9
+# Settings for Fedora and EL == 9
+# In EL >= 10 docbook5-style-xsl, needed by asciidoctor, is unwanted package
+%if 0%{?fedora} || 0%{?rhel} == 9
 %bcond_without              asciidoctor
 %else
 %bcond_with                 asciidoctor
@@ -58,11 +59,11 @@
 %bcond_without              libsecret
 
 # Allow p4 subpackage to be toggled via --with/--without
-# Disable by default if we lack python2 or python3 support
-%if %{with python2} || %{with python3}
-%bcond_without              p4
-%else
+# Disable p4 package by default on EL >= 10
+%if 0%{?rhel} >= 10
 %bcond_with                 p4
+%else
+%bcond_without              p4
 %endif
 
 # Hardening flags for EL-7
@@ -77,7 +78,7 @@
 %global _package_note_file  %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
 
 Name:           git
-Version:        2.43.1
+Version:        2.45.2
 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
@@ -163,6 +164,7 @@ BuildRequires:  findutils
 BuildRequires:  gawk
 BuildRequires:  gcc
 BuildRequires:  gettext
+BuildRequires:  glibc-utils
 BuildRequires:  gnupg2
 BuildRequires:  libcurl-devel
 BuildRequires:  make
@@ -639,13 +641,6 @@ rm -rf contrib/fast-import/import-zips.py
 %endif
 # endif with python2
 
-# Use python3 to avoid an unnecessary python2 dependency, if possible.
-%if %{with python3}
-sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
-    contrib/hg-to-git/hg-to-git.py
-%endif
-# endif with python3
-
 %install
 %make_install %{?with_docs:install-doc}
 
@@ -1045,6 +1040,13 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Mon Jul 01 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.2-1
+- update to 2.45.2
+- add glibc-utils BuildRequires
+- build docs with asciidoc instead of a asciidoctor
+- drop git-p4 subpackage
+- Resolves: RHEL-45572, RHEL-45215
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.43.1-2
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index 0a91dab..59bae85 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.43.1.tar.xz) = c8cb27645f09b831a6206bafa91c955d735b4257a98b1adaaaa5692a0a3aaa0417878095f88eca59d4fe0ffa058865508b5099db097e7b4b06253a16f57c3b3e
-SHA512 (git-2.43.1.tar.sign) = 0f84b136111bc6f6b99ad325fd9def9554ed1ec032b765c32c7299e91702cf44251b31a2e5453ab1379b8c342f640736597459bfaddaf8c0064004ee32535820
+SHA512 (git-2.45.2.tar.xz) = dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73
+SHA512 (git-2.45.2.tar.sign) = 331ba231f1d042ad41b30d81225fc31c47bc38dfb2995156353a97cd66f0a0c4d86d228e85dfca0926761b19d2e37e5f273b3bbddbca3e1c1ae3c999401fe7bd