From 24de439725ffdf8450225b399bffc115c46e6d4d Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Thu, 21 May 2020 13:37:09 -0500 Subject: [PATCH] Minor conditional fixes for ELN Signed-off-by: Merlin Mathesius --- git.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index bebca5a..a5b1529 100644 --- a/git.spec +++ b/git.spec @@ -8,14 +8,19 @@ # Settings for Fedora %if 0%{?fedora} -%bcond_without asciidoctor # linkchecker is not available on EL %bcond_without linkcheck %else -%bcond_with asciidoctor %bcond_with linkcheck %endif +# Settings for Fedora and EL >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 +%bcond_without asciidoctor +%else +%bcond_with asciidoctor +%endif + # Settings for Fedora and EL > 7 %if 0%{?fedora} || 0%{?rhel} > 7 %bcond_with python2 @@ -85,7 +90,7 @@ Name: git Version: 2.26.2 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -1060,6 +1065,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Thu May 21 2020 Merlin Mathesius - 2.26.2-2 +- Minor conditional fixes for ELN + * Mon Apr 20 2020 Todd Zullinger - 2.26.2-1 - update to 2.26.2 (CVE-2020-11008)