diff --git a/git.spec b/git.spec index 4bf649e..e9000b1 100644 --- a/git.spec +++ b/git.spec @@ -99,8 +99,8 @@ #global rcrev .rc0 Name: git -Version: 2.43.5 -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,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu Nov 28 2024 Ondřej Pohořelský - 2.47.1-1 +- update to 2.47.1 +- Resolves: RHEL-63964 + * Thu Jun 27 2024 Ondřej Pohořelský - 2.43.5-1 - Update to 2.43.5 - Resolves: RHEL-36353, RHEL-36357, RHEL-36371, RHEL-36383, RHEL-36387 diff --git a/sources b/sources index 6903276..0d04741 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.43.5.tar.xz) = 7c507e29d102d3597ae867c0bfb1befc4facdfb1934b2361ee390c4cd9f68753aef1542a955a0684441f4ccad2b3a7fa560677466ccab4ee457499b0968d41b0 -SHA512 (git-2.43.5.tar.sign) = 234877413715cccbd99a17e3be940b563d942717b65eabdfac703591cf5fe209d587d27d81f49564844772647612da9b7bc48e31b5530ef7afb48dbdba60cc58 +SHA512 (git-2.47.1.tar.xz) = 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea +SHA512 (git-2.47.1.tar.sign) = 89557b00303ce7ea063e4bbe8a81827c44ffaf997ae5a5bd1db6f671b10fd1050069bf74a10d797ec6f65453b9839e34fdc69f029bc8a6cfb8e9918fad8eda1a