From 8faf6223eab6ab1121f94c7e4bfd58579aeafe3b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 29 Jul 2019 10:49:30 -0400 Subject: [PATCH] drop jgit BR on Fedora > 30 With the move of java packages to modules, jgit looks likely to become unavailable as a BuildRequires in Fedora soon. Avoid it on Fedora > 30 for now. This affects 3 tests, 2 for packfile format (t5310-pack-bitmaps) and 1 of ls-remote (t5512-ls-remote). --- git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d9c2c5b..f19fc2d 100644 --- a/git.spec +++ b/git.spec @@ -213,7 +213,7 @@ BuildRequires: highlight %endif # endif fedora, el-6, or el7-ppc64 BuildRequires: httpd -%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) +%if 0%{?fedora} && ! ( 0%{?fedora} > 30 || %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) @@ -1021,6 +1021,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" * Thu Jul 25 2019 Todd Zullinger - 2.22.0-2 - completion: do not cache if --git-completion-helper fails - avoid trailing comments in spec file +- drop jgit on Fedora > 30 * Thu Jul 25 2019 Fedora Release Engineering - 2.22.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild