From c22491b4e8c68ba24ce2db899b6ac2e2995fb500 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 26 Nov 2020 00:07:19 -0500 Subject: [PATCH] add epel-rpm-macros BuildRequires on EL-7 (#1872865) We intend to support building on all supported Fedora and EPEL releases from the Rawhide branch. On EL-7, the %build_cflags and %build_ldflags macros are not present without installing epel-rpm-macros. Add a build requirement to ensure these macros are available when building on EL-7. --- git.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git.spec b/git.spec index ad1623e..2ef6a9a 100644 --- a/git.spec +++ b/git.spec @@ -160,6 +160,11 @@ BuildRequires: diffutils BuildRequires: emacs-common %endif # endif emacs-common +%if 0%{?rhel} == 7 +# Require epel-rpm-macros for the %%build_cflags and %%build_ldflags macros +BuildRequires: epel-rpm-macros +%endif +# endif rhel == 7 BuildRequires: expat-devel BuildRequires: findutils BuildRequires: gawk @@ -1086,6 +1091,7 @@ rmdir --ignore-fail-on-non-empty "$testdir" %changelog * Wed Nov 25 2020 Todd Zullinger - 2.29.2-3 - apply upstream patch to resolve git fast-import memory leak (#1900335) +- add epel-rpm-macros BuildRequires on EL-7 (#1872865) * Sat Nov 07 2020 Todd Zullinger - 2.29.2-2 - apply upstream patch to resolve git log segfault (#1791810)