Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/perl-Package-Generator.git#012fd03d38d6fa145fce5bf612a9e0e529667e7a
This commit is contained in:
DistroBaker
parent
e70af84324
commit
7879432816
@ -1,52 +0,0 @@
|
||||
--- t/000-report-versions-tiny.t
|
||||
+++ t/000-report-versions-tiny.t
|
||||
@@ -1,12 +1,6 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
-use Test::More 0.88;
|
||||
-# This is a relatively nice way to avoid Test::NoWarnings breaking our
|
||||
-# expectations by adding extra tests, without using no_plan. It also helps
|
||||
-# avoid any other test module that feels introducing random tests, or even
|
||||
-# test plans, is a nice idea.
|
||||
-our $success = 0;
|
||||
-END { $success && done_testing; }
|
||||
+use Test::More tests => 1;
|
||||
|
||||
# List our own version used to generate this
|
||||
my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n";
|
||||
@@ -52,7 +46,7 @@ eval { $v .= pmver('Carp','any version')
|
||||
eval { $v .= pmver('ExtUtils::MakeMaker','6.30') };
|
||||
eval { $v .= pmver('Scalar::Util','any version') };
|
||||
eval { $v .= pmver('Symbol','any version') };
|
||||
-eval { $v .= pmver('Test::More','0.96') };
|
||||
+eval { $v .= pmver('Test::More','0.47') };
|
||||
eval { $v .= pmver('strict','any version') };
|
||||
eval { $v .= pmver('warnings','any version') };
|
||||
|
||||
@@ -68,7 +62,6 @@ EOT
|
||||
|
||||
diag($v);
|
||||
ok(1, "we really didn't test anything, just reporting data");
|
||||
-$success = 1;
|
||||
|
||||
# Work around another nasty module on CPAN. :/
|
||||
no warnings 'once';
|
||||
--- xt/release/changes_has_content.t
|
||||
+++ xt/release/changes_has_content.t
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
use Test::More tests => 2;
|
||||
|
||||
-note 'Checking Changes';
|
||||
my $changes_file = 'Changes';
|
||||
my $newver = '1.106';
|
||||
my $trial_token = '-TRIAL';
|
||||
@@ -14,8 +13,6 @@ SKIP: {
|
||||
ok(_get_changes($newver), "$changes_file has content for $newver");
|
||||
}
|
||||
|
||||
-done_testing;
|
||||
-
|
||||
# _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
|
||||
# by Jerome Quelin
|
||||
sub _get_changes
|
||||
@ -1,5 +1,3 @@
|
||||
# We need to patch the test suite if we have an old version of Test::More
|
||||
%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
|
||||
# Run extra test
|
||||
%if ! (0%{?rhel})
|
||||
%bcond_without perl_Package_Generator_enables_extra_test
|
||||
@ -9,25 +7,30 @@
|
||||
|
||||
Name: perl-Package-Generator
|
||||
Version: 1.106
|
||||
Release: 19%{?dist}
|
||||
Release: 20%{?dist}
|
||||
Summary: Generate new packages quickly and easily
|
||||
License: GPL+ or Artistic
|
||||
URL: https://metacpan.org/release/Package-Generator
|
||||
Source0: https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Package-Generator-%{version}.tar.gz
|
||||
Patch1: Package-Generator-1.106-old-Test::More.patch
|
||||
Source0: https://cpan.metacpan.org/modules/by-module/Package/Package-Generator-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
# Module Build
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
|
||||
# Module
|
||||
BuildRequires: perl(Carp)
|
||||
BuildRequires: perl(Scalar::Util)
|
||||
BuildRequires: perl(strict)
|
||||
BuildRequires: perl(warnings)
|
||||
# Test Suite
|
||||
BuildRequires: perl(Params::Util) >= 0.11
|
||||
BuildRequires: perl(Test::More) >= 0.47
|
||||
BuildRequires: perl(Test::More) >= 0.96
|
||||
%if %{with perl_Package_Generator_enables_extra_test}
|
||||
# Extra Tests
|
||||
BuildRequires: perl(Test::Pod)
|
||||
BuildRequires: perl(Test::Pod) >= 1.41
|
||||
%endif
|
||||
# Runtime
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
||||
@ -39,20 +42,14 @@ them unused names and sets up their package data, if provided.
|
||||
%prep
|
||||
%setup -q -n Package-Generator-%{version}
|
||||
|
||||
# We need to patch the test suite if we have an old version of Test::More
|
||||
%if %{old_test_more}
|
||||
%patch1
|
||||
%endif
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
|
||||
%{_fixperms} %{buildroot}
|
||||
find %{buildroot} -type f -name .packlist -delete
|
||||
%{_fixperms} -c %{buildroot}
|
||||
|
||||
%check
|
||||
make test
|
||||
@ -61,12 +58,23 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc Changes LICENSE README
|
||||
%license LICENSE
|
||||
%doc Changes README
|
||||
%{perl_vendorlib}/Package/
|
||||
%{_mandir}/man3/Package::Generator.3pm*
|
||||
%{_mandir}/man3/Package::Reaper.3pm*
|
||||
%{_mandir}/man3/Package::Generator.3*
|
||||
%{_mandir}/man3/Package::Reaper.3*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 13 2021 Paul Howarth <paul@city-fan.org> - 1.106-20
|
||||
- Spec tidy-up
|
||||
- Use author-independent source URL
|
||||
- Specify all build requirements
|
||||
- Drop support for building with Test::More < 0.88
|
||||
- Drop redundant buildroot cleaning in %%install section
|
||||
- Simplify find command using -delete
|
||||
- Fix permissions verbosely
|
||||
- Use %%license macro
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user