update to 2.49.0

Each update git@.service has been overwritten, removing users custom configurations.
Marking it as config(noreplace) should prevent this behaviour.

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.43.1
+Version:        2.49.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
@@ -163,6 +163,7 @@ BuildRequires:  findutils
 BuildRequires:  gawk
 BuildRequires:  gcc
 BuildRequires:  gettext
+BuildRequires:  glibc-utils
 BuildRequires:  gnupg2
 BuildRequires:  libcurl-devel
 BuildRequires:  make
@@ -534,7 +535,7 @@ install -p -m 755 %{SOURCE99} print-failed-test-output
 # 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
+rm git-archimport.perl Documentation/git-archimport.adoc
 
 %if %{without cvs}
 # Remove git-cvs* from command list
@@ -607,7 +608,7 @@ sed -i 's@"++GITWEB_HOME_LINK_STR++"@$ENV{"SERVER_NAME"} ? "git://" . $ENV{"SERV
 
 # Move contrib/{contacts,subtree} docs to Documentation so they build with the
 # proper asciidoc/docbook/xmlto options
-mv contrib/{contacts,subtree}/git-*.txt Documentation/
+mv contrib/{contacts,subtree}/git-*.adoc Documentation/
 
 %build
 # Improve build reproducibility
@@ -639,13 +640,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}
 
@@ -781,7 +775,7 @@ grep -E  "$not_core_re" bin-man-doc-files > bin-man-doc-git-files
 # contrib
 not_core_doc_re="(git-(cvs|gui|citool|daemon|instaweb|subtree))|p4|svn|email|gitk|gitweb"
 mkdir -p %{buildroot}%{_pkgdocdir}/
-cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.txt Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/
+cp -pr CODE_OF_CONDUCT.md README.md Documentation/*.adoc Documentation/RelNotes contrib %{buildroot}%{_pkgdocdir}/
 # Remove contrib/ files/dirs which have nothing useful for documentation
 rm -rf %{buildroot}%{_pkgdocdir}/contrib/{contacts,credential}/
 cp -p gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb
@@ -873,6 +867,16 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5
 %endif
 # endif rhel == 8 && arch == s390x
 
+%if "%{_arch}" == "s390x"
+# Skip tests which fail on s390x
+#
+# The following tests are failing on s390x.
+# https://lore.kernel.org/git/Z8dIZmscTdi8dZAY@teonanacatl.net/
+#
+# t5620.4 'do partial clone 2, backfill min batch size'
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5620.4"
+%endif
+# endif "%{_arch}" == "s390x"
 export GIT_SKIP_TESTS
 
 # Set LANG so various UTF-8 tests are run
@@ -958,7 +962,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 
 %if %{with cvs}
 %files cvs
-%{_pkgdocdir}/*git-cvs*.txt
+%{_pkgdocdir}/*git-cvs*.adoc
 %{_bindir}/git-cvsserver
 %{gitexecdir}/*cvs*
 %{?with_docs:%{_mandir}/man1/*cvs*.1*}
@@ -967,22 +971,22 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 # endif with cvs
 
 %files daemon
-%{_pkgdocdir}/git-daemon*.txt
+%{_pkgdocdir}/git-daemon*.adoc
 %{_unitdir}/git.socket
-%{_unitdir}/git@.service
+%config(noreplace) %{_unitdir}/git@.service
 %{gitexecdir}/git-daemon
 %{_localstatedir}/lib/git
 %{?with_docs:%{_mandir}/man1/git-daemon*.1*}
 %{?with_docs:%{_pkgdocdir}/git-daemon*.html}
 
 %files email
-%{_pkgdocdir}/*email*.txt
+%{_pkgdocdir}/*email*.adoc
 %{gitexecdir}/*email*
 %{?with_docs:%{_mandir}/man1/*email*.1*}
 %{?with_docs:%{_pkgdocdir}/*email*.html}
 
 %files -n gitk
-%{_pkgdocdir}/*gitk*.txt
+%{_pkgdocdir}/*gitk*.adoc
 %{_bindir}/*gitk*
 %{_datadir}/gitk
 %{bash_completions_dir}/gitk
@@ -991,7 +995,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 
 %files -n gitweb
 %{_pkgdocdir}/*.gitweb
-%{_pkgdocdir}/gitweb*.txt
+%{_pkgdocdir}/gitweb*.adoc
 %{?with_docs:%{_mandir}/man1/gitweb.1*}
 %{?with_docs:%{_mandir}/man5/gitweb.conf.5*}
 %{?with_docs:%{_pkgdocdir}/gitweb*.html}
@@ -1004,8 +1008,8 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{gitexecdir}/git-citool
 %{_datadir}/applications/*git-gui.desktop
 %{_datadir}/git-gui/
-%{_pkgdocdir}/git-gui.txt
+%{_pkgdocdir}/git-gui.adoc
-%{_pkgdocdir}/git-citool.txt
+%{_pkgdocdir}/git-citool.adoc
 %{?with_docs:%{_mandir}/man1/git-gui.1*}
 %{?with_docs:%{_pkgdocdir}/git-gui.html}
 %{?with_docs:%{_mandir}/man1/git-citool.1*}
@@ -1013,7 +1017,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 
 %files instaweb
 %{gitexecdir}/git-instaweb
-%{_pkgdocdir}/git-instaweb.txt
+%{_pkgdocdir}/git-instaweb.adoc
 %{?with_docs:%{_mandir}/man1/git-instaweb.1*}
 %{?with_docs:%{_pkgdocdir}/git-instaweb.html}
 
@@ -1021,7 +1025,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %files p4
 %{gitexecdir}/*p4*
 %{gitexecdir}/mergetools/p4merge
-%{_pkgdocdir}/*p4*.txt
+%{_pkgdocdir}/*p4*.adoc
 %{?with_docs:%{_mandir}/man1/*p4*.1*}
 %{?with_docs:%{_pkgdocdir}/*p4*.html}
 %endif
@@ -1034,17 +1038,59 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 
 %files subtree
 %{gitexecdir}/git-subtree
-%{_pkgdocdir}/git-subtree.txt
+%{_pkgdocdir}/git-subtree.adoc
 %{?with_docs:%{_mandir}/man1/git-subtree.1*}
 %{?with_docs:%{_pkgdocdir}/git-subtree.html}
 
 %files svn
 %{gitexecdir}/git-svn
-%{_pkgdocdir}/git-svn.txt
+%{_pkgdocdir}/git-svn.adoc
 %{?with_docs:%{_mandir}/man1/git-svn.1*}
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Mon Mar 17 2025 Ondřej Pohořelský <opohorel@redhat.com> - 2.49.0-1
+- update to 2.49.0
+
+* Wed Jan 15 2025 Ondřej Pohořelský <opohorel@redhat.com> - 2.48.1-1
+- update to 2.48.1
+
+* Mon Jan 13 2025 Ondřej Pohořelský <opohorel@redhat.com> - 2.48.0-1
+- update to 2.48.0
+
+* Mon Nov 25 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.47.1-1
+- update to 2.47.1
+
+* Tue Oct 08 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.47.0-1
+- update to 2.47.0
+
+* Tue Sep 24 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.46.2-1
+- update to 2.46.2
+
+* Mon Sep 16 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.46.1-1
+- update to 2.46.1
+
+* Mon Aug 05 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.46.0-1
+- update to 2.46.0
+
+* Mon Jun 03 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.2-2
+- add glibc-utils BuildRequires
+
+* Mon Jun 03 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.2-1
+- update to 2.45.2
+
+* Wed May 15 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.1-1
+- update to 2.45.1
+
+* Tue Apr 30 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.0-1
+- update to 2.45.0
+
+* Mon Feb 26 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.44.0-1
+- update to 2.44.0
+
+* Thu Feb 15 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.2-1
+- update to 2.43.2
+
 * Mon Feb 12 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.1-1
 - update to 2.43.1
 - resolves: #2263575

sources

@@ -1,2 +1,2 @@
-SHA512 (git-2.43.1.tar.xz) = c8cb27645f09b831a6206bafa91c955d735b4257a98b1adaaaa5692a0a3aaa0417878095f88eca59d4fe0ffa058865508b5099db097e7b4b06253a16f57c3b3e
+SHA512 (git-2.49.0.tar.xz) = 81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0
-SHA512 (git-2.43.1.tar.sign) = 0f84b136111bc6f6b99ad325fd9def9554ed1ec032b765c32c7299e91702cf44251b31a2e5453ab1379b8c342f640736597459bfaddaf8c0064004ee32535820
+SHA512 (git-2.49.0.tar.sign) = e956f83ee0973295ec608aa6ab1df11992d8fc10f1702a0cdbf849f7659d94666fe714f60a7b4aeeed064bc49e1345791e3d8b0a867c075544eb48f01b84fd27