From 39a7618fa8416caabd8e41f4524d1f78946599b1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 3 Dec 2019 21:43:31 -0500 Subject: [PATCH] restore jgit BR for use in tests This effectively reverts 8faf622 (drop jgit BR on Fedora > 30, 2019-07-29). The jgit package is available once again; use it to allow some compatibility tests to be run. Resolves: https://bugzilla.redhat.com/1766626 --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ff72aab..1b4969c 100644 --- a/git.spec +++ b/git.spec @@ -93,7 +93,7 @@ Name: git Version: 2.24.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -213,7 +213,7 @@ BuildRequires: highlight %endif # endif fedora, el-6, or el7-ppc64 BuildRequires: httpd -%if 0%{?fedora} && ! ( 0%{?fedora} > 30 || %{_arch} == i386 || %{_arch} == s390x ) +%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) BuildRequires: jgit %endif # endif fedora (except i386 and s390x) @@ -1029,6 +1029,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Dec 04 2019 Todd Zullinger - 2.24.0-2 +- restore jgit BR for use in tests + * Mon Nov 04 2019 Todd Zullinger - 2.24.0-1 - update to 2.24.0