diff --git a/git.skip-test-patterns b/git.skip-test-patterns index 1a1139f..12b247d 100644 --- a/git.skip-test-patterns +++ b/git.skip-test-patterns @@ -1,8 +1,10 @@ +^ok 1 # SKIP enable client-side http/2 \(missing HTTP2\)$ expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true filesystem does not corrupt utf-8 fsmonitor--daemon is not supported on this platform GIT_SKIP_TESTS missing AUTOIDENT +missing BUILTIN_TXT_ missing CASE_INSENSITIVE_FS missing DONTHAVEIT missing ([!]LONG_IS_64BIT,)?EXPENSIVE diff --git a/git.spec b/git.spec index 1e05b82..84b152c 100644 --- a/git.spec +++ b/git.spec @@ -67,14 +67,14 @@ %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} # Define for release candidates -#global rcrev .rc0 +%global rcrev .rc0 # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git -Version: 2.38.1 -Release: 3%{?rcrev}%{?dist} +Version: 2.39.0 +Release: 0.0%{?rcrev}%{?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 URL: https://git-scm.com/ @@ -184,6 +184,8 @@ BuildRequires: acl %if 0%{?fedora} || 0%{?rhel} >= 8 # Needed by t5540-http-push-webdav.sh BuildRequires: apr-util-bdb +# Needed by t5559-http-fetch-smart-http2.sh +BuildRequires: mod_http2 %endif # endif fedora or rhel >= 8 BuildRequires: bash @@ -793,7 +795,17 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker # endif with docs && with linkcheck # Tests to skip on all releases and architectures -GIT_SKIP_TESTS="" +# +# 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" + +%if 0%{?rhel} && 0%{?rhel} < 8 +# Skip tests which require mod_http2 on el7 +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5559" +%endif +# endif rhel < 8 %ifarch aarch64 %{arm} %{power64} # Skip tests which fail on aarch64, arm, and ppc @@ -1008,6 +1020,10 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Nov 23 2022 Todd Zullinger - 2.39.0-0.0.rc0 +- update to 2.39.0-rc0 +- add mod_http2 BuildRequires for tests + * Sat Nov 12 2022 Todd Zullinger - 2.38.1-3 - use %%bash_completions_dir diff --git a/sources b/sources index 3f9c27f..0ca8e36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (git-2.38.1.tar.xz) = e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0 -SHA512 (git-2.38.1.tar.sign) = a10fa332d5d5ea96bf6a0ed0c2a568212dd033acd539d07efbb73def13dd0144640a5a17477ea5cfe4104f1fa166237d7b251de275307eac7b91c6e60ca3de5d +SHA512 (git-2.39.0.rc0.tar.xz) = da92b6b8ec804712f035cb4017ab5d277ca3149749921455cc362a11f7cb96d4347d1eb9e7d02fc31bc0c06f3bdc5ef7c4f40d02f9b92f42e708a2f474e28ea6 +SHA512 (git-2.39.0.rc0.tar.sign) = 04b3e0a9558cb423073e8c7e869e7c616df1f691dac147bf4c30253cf9c66f9b4f030618a232381b8468b9c575d0751b7744725efc7c3d7ebd92739e868d697c