Require perl-generators on EL > 7

Add a %{use_perl_generators} macro to control this requirement.
This commit is contained in:
Todd Zullinger 2018-04-10 10:08:55 -04:00
parent c1f934e016
commit eeb7261573

View File

@ -20,8 +20,10 @@
# Settings for Fedora and EL > 7 # Settings for Fedora and EL > 7
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%bcond_without python3 %bcond_without python3
%global use_perl_generators 1
%else %else
%bcond_with python3 %bcond_with python3
%global use_perl_generators 0
%endif %endif
# Settings for Fedora and EL >= 7 # Settings for Fedora and EL >= 7
@ -83,7 +85,7 @@
Name: git Name: git
Version: 2.17.0 Version: 2.17.0
Release: 1%{?rcrev}%{?dist} Release: 2%{?rcrev}%{?dist}
Summary: Fast Version Control System Summary: Fast Version Control System
License: GPLv2 License: GPLv2
URL: https://git-scm.com/ URL: https://git-scm.com/
@ -145,7 +147,7 @@ BuildRequires: openssl-devel
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
BuildRequires: perl(Error) BuildRequires: perl(Error)
BuildRequires: perl(Test) BuildRequires: perl(Test)
%if 0%{?fedora} %if %{use_perl_generators}
BuildRequires: perl-generators BuildRequires: perl-generators
%endif %endif
%if %{bashcomp_pkgconfig} %if %{bashcomp_pkgconfig}
@ -893,6 +895,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Tue Apr 10 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-2
- Require perl-generators on EL > 7
* Mon Apr 09 2018 Todd Zullinger <tmz@pobox.com> * Mon Apr 09 2018 Todd Zullinger <tmz@pobox.com>
- daemon: use --log-destination=stderr with systemd - daemon: use --log-destination=stderr with systemd
- daemon: fix condition for redirecting stderr - daemon: fix condition for redirecting stderr