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

only add highlight test BR for ppc64le/x86_64 on EL7+

Browse Source 
The highlight package is not available for aarch64 or s390x in EL7+.
Simplify the conditional (a little) by only listing the 2 known
architectures where highlight is available for EL7+.  It's not worth
adding much complexity for a dependency that is only used in 3 tests
for the gitweb subpackage.
This commit is contained in:
Todd Zullinger 2020-01-02 23:07:28 -05:00
parent 8f50e00fab
commit 9b287b4f63
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git.spec
View File

@ -208,10 +208,10 @@ BuildRequires: gnupg
BuildRequires: gnupg2-smime BuildRequires: gnupg2-smime
%endif %endif
# endif fedora or el > 8 # endif fedora or el > 8
%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 )) %if 0%{?fedora} || 0%{?rhel} == 6 || ( 0%{?rhel} >= 7 && ( %{_arch} == ppc64le || %{_arch} == x86_64 ) )
BuildRequires: highlight BuildRequires: highlight
%endif %endif
# endif fedora, el-6, or el7-ppc64 # endif fedora, el-6, or el7+ (ppc64le/x86_64)
BuildRequires: httpd BuildRequires: httpd
%if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x ) %if 0%{?fedora} && ! ( %{_arch} == i386 || %{_arch} == s390x )
BuildRequires: jgit BuildRequires: jgit
@ -1031,6 +1031,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog %changelog
* Fri Jan 03 2020 Todd Zullinger <tmz@pobox.com> - 2.25.0-0.1.rc1 * Fri Jan 03 2020 Todd Zullinger <tmz@pobox.com> - 2.25.0-0.1.rc1
- update to 2.25.0-rc1 - update to 2.25.0-rc1
- only add highlight test BR for ppc64le/x86_64 on EL7+
* Wed Dec 25 2019 Todd Zullinger <tmz@pobox.com> - 2.25.0-0.0.rc0 * Wed Dec 25 2019 Todd Zullinger <tmz@pobox.com> - 2.25.0-0.0.rc0
- update to 2.25.0-rc0 - update to 2.25.0-rc0