From e23e4502e70f0f550ff3017b6e08ed562282afcc Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 24 Oct 2019 17:50:31 +0100 Subject: [PATCH] Avoid the need for bootstrapping EPEL builds --- perl-MooseX-Getopt.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/perl-MooseX-Getopt.spec b/perl-MooseX-Getopt.spec index b7ba986..fb1927f 100644 --- a/perl-MooseX-Getopt.spec +++ b/perl-MooseX-Getopt.spec @@ -1,10 +1,17 @@ +# Run extra test +%if ! (0%{?rhel}) +%bcond_without perl_MooseX_Getopt_enables_extra_test +%else +%bcond_with perl_MooseX_Getopt_enables_extra_test +%endif + Name: perl-MooseX-Getopt Summary: Moose role for processing command line options Version: 0.74 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic URL: https://metacpan.org/release/MooseX-Getopt -Source0: https://cpan.metacpan.org/authors/id/E/ET/ETHER/MooseX-Getopt-%{version}.tar.gz +Source0: https://cpan.metacpan.org/modules/by-module/MooseX/MooseX-Getopt-%{version}.tar.gz BuildArch: noarch # Module Build BuildRequires: perl-generators @@ -46,16 +53,17 @@ BuildRequires: perl(version) # Optional Test Requirements BuildRequires: perl(CPAN::Meta) BuildRequires: perl(CPAN::Meta::Requirements) >= 2.120900 -# MooseX::SimpleConfig -> MooseX::ConfigFromFile -> MooseX::Types::Path::Class -> MooseX::Getopt -%if !0%{?perl_bootstrap} +# MooseX::SimpleConfig → MooseX::ConfigFromFile → MooseX::Types::Path::Class → MooseX::Getopt +%if !0%{?perl_bootstrap} && %{with perl_MooseX_Getopt_enables_extra_test} BuildRequires: perl(MooseX::ConfigFromFile) >= 0.08 BuildRequires: perl(MooseX::SimpleConfig) >= 0.07 BuildRequires: perl(MooseX::StrictConstructor) %endif BuildRequires: perl(YAML) # Runtime -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# Make sure we don't get doc-file dependencies from the tests %{?perl_default_filter} %description @@ -65,7 +73,7 @@ objects using parameters passed in from the command line. %prep %setup -q -n MooseX-Getopt-%{version} -# silence rpmlint warnings +# Silence rpmlint warnings sed -i '1s,#!.*perl,#!%{__perl},' t/*.t chmod -c -x t/104_override_usage.t @@ -96,6 +104,9 @@ perl Build.PL --installdirs=vendor %{_mandir}/man3/MooseX::Getopt::Strict.3* %changelog +* Thu Oct 24 2019 aul Howarth - 0.74-6 +- Avoid the need for bootstrapping EPEL builds + * Fri Jul 26 2019 Fedora Release Engineering - 0.74-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild