From 5ee99f14c5997c719d8444d2b9bb8139d8cb7a5c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 11 Mar 2025 07:16:50 +0000
Subject: [PATCH] import CS git-2.47.1-1.el9

---
 .git.metadata  |  4 ++--
 .gitignore     |  4 ++--
 SPECS/git.spec | 34 ++++++++++++++++++++++++----------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.git.metadata b/.git.metadata
index 40b064b..8591086 100644
--- a/.git.metadata
+++ b/.git.metadata
@@ -1,2 +1,2 @@
-9a1c24da266ee42b4b8fd32274bae3f5ab3968da SOURCES/git-2.43.0.tar.sign
-d34f8331e3dcd7d2beb2f4af3e3d6db50b8036f1 SOURCES/git-2.43.0.tar.xz
+6ee94f976a315b7897a6e663d8e6e97283ff5adb SOURCES/git-2.47.1.tar.sign
+63654fcfa1604c7470bcc9c4e2d1cdba218a8bc3 SOURCES/git-2.47.1.tar.xz
diff --git a/.gitignore b/.gitignore
index 40873d0..86be50f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/git-2.43.0.tar.sign
-SOURCES/git-2.43.0.tar.xz
+SOURCES/git-2.47.1.tar.sign
+SOURCES/git-2.47.1.tar.xz
diff --git a/SPECS/git.spec b/SPECS/git.spec
index a5b2dc0..e9000b1 100644
--- a/SPECS/git.spec
+++ b/SPECS/git.spec
@@ -99,8 +99,8 @@
 #global rcrev   .rc0
 
 Name:           git
-Version:        2.43.0
-Release:        1%{?rcrev}%{?dist}
+Version:        2.47.1
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -678,13 +678,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}
 
@@ -926,6 +919,19 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5
 %endif
 # endif rhel == 8 && arch == s390x
 
+%if 0%{?rhel} == 9 && "%{_arch}" == "s390x"
+# Skip tests which fail on s390x on rhel-9
+#
+# The following tests fail on s390x & el9.  The cause should be investigated.
+# However, it's a lower priority since the same tests work consistently on
+# s390x with Fedora and RHEL-10.
+#
+# t5003.81 'archive remote http repository'
+
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5003.81"
+%endif
+# endif rhel == 9 && arch == s390x
+
 export GIT_SKIP_TESTS
 
 # Set LANG so various UTF-8 tests are run
@@ -1031,7 +1037,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{_pkgdocdir}/git-daemon*.txt
 %if %{use_systemd}
 %{_unitdir}/git.socket
-%{_unitdir}/git@.service
+%config(noreplace) %{_unitdir}/git@.service
 %else
 %config(noreplace)%{_sysconfdir}/xinetd.d/git
 %endif
@@ -1118,6 +1124,14 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Thu Nov 28 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.47.1-1
+- update to 2.47.1
+- Resolves: RHEL-63964
+
+* Thu Jun 27 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.5-1
+- Update to 2.43.5
+- Resolves: RHEL-36353, RHEL-36357, RHEL-36371, RHEL-36383, RHEL-36387
+
 * Wed Dec 06 2023 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.0-1
 - Update to 2.43.0
 - Resolves: RHEL-17100