rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add epel-rpm-macros BuildRequires on EL-7 (#1872865)

Browse Source 
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.
This commit is contained in:
Todd Zullinger 2020-11-26 00:07:19 -05:00
parent 1faa4b1131
commit c22491b4e8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.spec
View File

@ -160,6 +160,11 @@ BuildRequires: diffutils
BuildRequires: emacs-common BuildRequires: emacs-common
%endif %endif
# endif emacs-common # 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: expat-devel
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gawk BuildRequires: gawk
@ -1086,6 +1091,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog %changelog
* Wed Nov 25 2020 Todd Zullinger <tmz@pobox.com> - 2.29.2-3 * Wed Nov 25 2020 Todd Zullinger <tmz@pobox.com> - 2.29.2-3
- apply upstream patch to resolve git fast-import memory leak (#1900335) - 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 <tmz@pobox.com> - 2.29.2-2 * Sat Nov 07 2020 Todd Zullinger <tmz@pobox.com> - 2.29.2-2
- apply upstream patch to resolve git log segfault (#1791810) - apply upstream patch to resolve git log segfault (#1791810)