diff --git a/git-2.40.1.tar.xz b/git-2.41.0.tar.xz similarity index 48% rename from git-2.40.1.tar.xz rename to git-2.41.0.tar.xz index 49f2890567a5b8748a14a8ef2b8fcc89d8cb7055..7e3df8c98ef531bd8cfbe5b7bfaa6735ba8bc5d0 100644 Binary files a/git-2.40.1.tar.xz and b/git-2.41.0.tar.xz differ diff --git a/git.spec b/git.spec index b9865a4a6ab3878763d0497ccc0043e2e8e7625e..1ee6ed6f867574da75279d635b1821b69a6fa75f 100644 --- a/git.spec +++ b/git.spec @@ -17,7 +17,7 @@ %global _package_note_file %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.40.1 +Version: 2.41.0 Release: %{anolis_release}%{?dist} Summary: Distributed version control system License: GPLv2 @@ -37,7 +37,7 @@ Patch2: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch %if %{with docs} -BuildRequires: %{_bindir}/pod2man +BuildRequires: /usr/bin/pod2man %if %{with asciidoctor} BuildRequires: docbook5-style-xsl rubygem-asciidoctor %else @@ -65,7 +65,7 @@ BuildRequires: pkgconfig(bash-completion) BuildRequires: systemd tcl tk xz zlib-devel >= 1.2 %if %{with tests} -BuildRequires: bash acl mod_http2 +BuildRequires: bash acl mod_http2 %if %{with cvs} BuildRequires: cvs cvsps %endif @@ -507,8 +507,13 @@ exit 0 find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker %endif -GIT_SKIP_TESTS="$GIT_SKIP_TESTS \ - t5540.5 t5540.6 t5540.7 t5540.8 t5540.9 t5540.10 t5540.11 \ +# Tests to skip on all releases and architectures +# +# t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with +# HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly. +# https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/ +GIT_SKIP_TESTS="t5559 \ + t5540.5 t5540.6 t5540.7 t5540.8 t5540.9 t5540.10 t5540.11 \ t5540.13 t5540.15 t5540.16 t5540.17 t5540.18 t5540.19 t5540.20" %ifarch aarch64 @@ -680,6 +685,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog +* Sat Jul 15 2023 Funda Wang - 2.41.0-1 +- New verison 2.41.0 + * Wed Apr 26 2023 Funda Wang - 2.40.1-1 - New version 2.40.1