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

Update conditions for future RHEL

Browse Source
This commit is contained in:
Pavel Cahyna 2018-04-13 17:30:53 +02:00 committed by Todd Zullinger
parent 1a82d92cd4
commit 34c2440884
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git.spec
View File

@ -75,8 +75,8 @@
%global __global_ldflags -Wl,-z,relro -Wl,-z,now %global __global_ldflags -Wl,-z,relro -Wl,-z,now
%endif %endif
# Test links in HTML documentation on Fedora (linkchecker is not in EL) # Test links in HTML documentation on Fedora (linkchecker is not in EL <= 7)
%if 0%{?fedora} %if 0%{?fedora} || 0%{?rhel} > 7
%global test_links 1 %global test_links 1
%else %else
%global test_links 0 %global test_links 0
@ -181,7 +181,7 @@ BuildRequires: cvs
BuildRequires: cvsps BuildRequires: cvsps
%endif %endif
BuildRequires: gnupg BuildRequires: gnupg
%if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} == 7 && %{_arch} != ppc64 )) %if 0%{?fedora} || ( 0%{?rhel} && ( 0%{?rhel} == 6 || 0%{?rhel} >= 7 && %{_arch} != ppc64 ))
BuildRequires: highlight BuildRequires: highlight
%endif %endif
BuildRequires: httpd BuildRequires: httpd
@ -904,6 +904,7 @@ make test || ./print-failed-test-output
%changelog %changelog
* Fri Apr 13 2018 Pavel Cahyna <pcahyna@redhat.com> * Fri Apr 13 2018 Pavel Cahyna <pcahyna@redhat.com>
- Use BuildRequires: perl-interpreter per the packaging guidelines - Use BuildRequires: perl-interpreter per the packaging guidelines
- Update conditions for future RHEL
* Tue Apr 10 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-2 * Tue Apr 10 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-2
- Require perl-generators on EL > 7 - Require perl-generators on EL > 7